author | Alex Pakhotin <alexp@mozilla.com> |
Mon, 22 Nov 2010 18:24:05 -0800 | |
changeset 58089 | fe7649100f19efff8bcd1e26aceb2338ecded92f |
parent 58088 | 86f686735122d00104bf3b9e310e0dfa9d3ff8e5 |
child 58091 | cbdf3ff3e88af95430416c0043e63ee6b0359643 |
push id | 17149 |
push user | blassey@mozilla.com |
push date | Tue, 23 Nov 2010 19:24:50 +0000 |
treeherder | mozilla-central@fe7649100f19 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | blassey, blocking-fennec |
bugs | 608428 |
milestone | 2.0b8pre |
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
|
--- a/dom/src/notification/nsDesktopNotification.cpp +++ b/dom/src/notification/nsDesktopNotification.cpp @@ -126,17 +126,21 @@ NS_IMPL_RELEASE_INHERITED(nsDOMDesktopNo nsDOMDesktopNotification::nsDOMDesktopNotification(const nsAString & title, const nsAString & description, const nsAString & iconURL, nsPIDOMWindow *aWindow, nsIScriptContext* aScriptContext, nsIURI* uri) : mTitle(title) , mDescription(description) +#ifdef ANDROID + , mIconURL((PRUnichar*)L"drawable://desktop_notification") +#else , mIconURL(iconURL) +#endif , mURI(uri) { mOwner = aWindow; mScriptContext = aScriptContext; } nsDOMDesktopNotification::~nsDOMDesktopNotification() {
--- a/embedding/android/Makefile.in +++ b/embedding/android/Makefile.in @@ -105,16 +105,18 @@ DEFAULT_BRANDPATH = $(DEPTH)/$(MOZ_BRAND DEFAULT_STRINGSPATH = android_strings.dtd ifdef MOZ_CRASHREPORTER PROCESSEDJAVAFILES += CrashReporter.java MOZ_ANDROID_DRAWABLES += embedding/android/resources/drawable/crash_reporter.png RES_LAYOUT += res/layout/crash_reporter.xml endif +MOZ_ANDROID_DRAWABLES += embedding/android/resources/drawable/desktop_notification.png + MOZ_ANDROID_DRAWABLES += $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn | tr '\n' ' '; fi) include $(topsrcdir)/config/rules.mk # Override the Java settings with some specific android settings include $(topsrcdir)/config/android-common.mk # Note that we're going to set up a dependency directly between embed_android.dex and the java files
new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2c557bf46d1e57590cd0ace752e5b26756e2865f GIT binary patch literal 1843 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