Bug 925467: Part 2: Blur the about:config search box to close the osk when tapping on content. r=jmathies
authorMarina Samuel <msamuel@mozilla.com>
Mon, 21 Oct 2013 13:02:06 -0400
changeset 151543 418d0fbd33b055d86cb7907142b8945118c217b2
parent 151542 f826a7afb3ccd07275f15ac0a82f31658a71155b
child 151544 40f8ff3f63b96f0fd60b571c4c559246809a47d8
push id25500
push userkwierso@gmail.com
push dateTue, 22 Oct 2013 00:33:10 +0000
treeherdermozilla-central@177bf37a49f5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmathies
bugs925467
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 925467: Part 2: Blur the about:config search box to close the osk when tapping on content. r=jmathies
browser/metro/Makefile.in
browser/metro/metroapp.ini.in
--- a/browser/metro/Makefile.in
+++ b/browser/metro/Makefile.in
@@ -8,17 +8,17 @@ include $(topsrcdir)/config/rules.mk
 # application.ini
 
 ifdef MOZILLA_OFFICIAL
 DEFINES += -DMOZILLA_OFFICIAL
 endif
 
 GRE_MILESTONE := $(shell tail -n 1 $(topsrcdir)/config/milestone.txt 2>/dev/null || tail -1 $(topsrcdir)/config/milestone.txt)
 GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid)
-DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
+DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID) -DMOZ_APP_BASENAME=$(MOZ_APP_BASENAME)
 
 # 'application.ini' breaks firefox build config. So we use something different.
 metroapp.ini: metroapp.ini.in $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt
 	$(RM) "metroapp.ini"
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $< > $@
 
 libs:: metroapp.ini
 	$(INSTALL) metroapp.ini $(FINAL_TARGET)
--- a/browser/metro/metroapp.ini.in
+++ b/browser/metro/metroapp.ini.in
@@ -1,12 +1,12 @@
 #filter substitution
 [App]
 Vendor=Mozilla
-Name=MetroFirefox
+Name=@MOZ_APP_BASENAME@
 UAName=Firefox
 Version=@GRE_MILESTONE@
 BuildID=@GRE_BUILDID@
 ID={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
 
 [Gecko]
 MinVersion=@GRE_MILESTONE@
 MaxVersion=@GRE_MILESTONE@