diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 17:24:54 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 17:24:54 +0000 |
| commit | 12412170af3b2596b1a11984e5f5bcced7da3acf (patch) | |
| tree | 40a9cab5279beeebd62ad7a37735f2ff86edbf8f /chrome/browser/notifications | |
| parent | 4a750007d8258df14df7a24c06e1636d941f2301 (diff) | |
| download | chromium_src-12412170af3b2596b1a11984e5f5bcced7da3acf.zip chromium_src-12412170af3b2596b1a11984e5f5bcced7da3acf.tar.gz chromium_src-12412170af3b2596b1a11984e5f5bcced7da3acf.tar.bz2 | |
Add ChromeBrowserMainExtraParts for non main parts.
This was originally submitted as http://codereview.chromium.org/8539038/ which was reverted because of a failing test on win.
This reverts the code back to a single instance of BrowserMainParts, with auxillary parts (Gtk, Views, Aura, Touch) implemented from a new base class, ChromeBrowserParts, which has a Chrome specific interface, allowing initialization to be better subdivided.
This should fix the notifications auto tests.
This CL also addresses the test failure on win (and a test failure on linux_chromeos triggered by the windows fix).
BUG=103821
TEST=Make sure all tests and autotests run
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/8598005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications')
| -rw-r--r-- | chrome/browser/notifications/desktop_notification_service_factory.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/notifications/desktop_notification_service_factory.cc b/chrome/browser/notifications/desktop_notification_service_factory.cc index f4402ab..ec8543a 100644 --- a/chrome/browser/notifications/desktop_notification_service_factory.cc +++ b/chrome/browser/notifications/desktop_notification_service_factory.cc @@ -35,8 +35,9 @@ DesktopNotificationServiceFactory::~DesktopNotificationServiceFactory() { ProfileKeyedService* DesktopNotificationServiceFactory::BuildServiceInstanceFor( Profile* profile) const { - DesktopNotificationService* service = - new DesktopNotificationService(profile, NULL); + DesktopNotificationService* service = new DesktopNotificationService(profile, + g_browser_process->notification_ui_manager()); + return service; } |