summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser.cc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-24 22:03:57 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-24 22:03:57 +0000
commitffa6f5975ce23dbd97f9300c97b46d3c0f29605b (patch)
treeed9b5c8b6427eb37ce66165dd4a20dad359cf469 /chrome/browser/ui/browser.cc
parent38cc5ad9ecc757db16a5e97c2fd0e6a1713ba86c (diff)
downloadchromium_src-ffa6f5975ce23dbd97f9300c97b46d3c0f29605b.zip
chromium_src-ffa6f5975ce23dbd97f9300c97b46d3c0f29605b.tar.gz
chromium_src-ffa6f5975ce23dbd97f9300c97b46d3c0f29605b.tar.bz2
Multiprofile: Fix all places where we observe BROWSER_THEME_CHANGED so that we
observe on a specific ThemeService. BUG=87457 TEST=none Review URL: http://codereview.chromium.org/7243013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser.cc')
-rw-r--r--chrome/browser/ui/browser.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index e2d117f..a60947f 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -74,6 +74,8 @@
#include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
#include "chrome/browser/tabs/tab_finder.h"
#include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/themes/theme_service.h"
+#include "chrome/browser/themes/theme_service_factory.h"
#include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h"
#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
@@ -241,8 +243,9 @@ Browser::Browser(Type type, Profile* profile)
NotificationService::AllSources());
registrar_.Add(this, NotificationType::EXTENSION_PROCESS_TERMINATED,
NotificationService::AllSources());
- registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
- NotificationService::AllSources());
+ registrar_.Add(
+ this, NotificationType::BROWSER_THEME_CHANGED,
+ Source<ThemeService>(ThemeServiceFactory::GetForProfile(profile_)));
registrar_.Add(this, NotificationType::TAB_CONTENT_SETTINGS_CHANGED,
NotificationService::AllSources());
registrar_.Add(this, NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,