diff options
| author | rockot@google.com <rockot@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 19:48:24 +0000 |
|---|---|---|
| committer | rockot@google.com <rockot@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 19:48:24 +0000 |
| commit | 069b0203a8374b8c9b4e4df3e75b16724d99eaf2 (patch) | |
| tree | 5eab9caa4b38fc054f0bb026235b865b44c6e59d /chrome/browser/extensions/chrome_notification_observer.cc | |
| parent | 98f49e49ef42b91b0e6c05c9c9f2132fb7e5fcc9 (diff) | |
| download | chromium_src-069b0203a8374b8c9b4e4df3e75b16724d99eaf2.zip chromium_src-069b0203a8374b8c9b4e4df3e75b16724d99eaf2.tar.gz chromium_src-069b0203a8374b8c9b4e4df3e75b16724d99eaf2.tar.bz2 | |
Revert 233956 "Move ExtensionProcessManager to src/extensions, p..."
Compile error, runtime.h has moved?
> Move ExtensionProcessManager to src/extensions, part 4
>
> * Move c/b/extensions/extension_process_manager.h to
> extensions/browser/process_manager.h
> * Rename ExtensionsProcessManager to ProcessManager
> * Place it in the "extensions" namespace
>
> BUG=313481
> TEST=browser_tests, unit_tests
> R=miket@chromium.org
> TBR=sky@chromium.org for mechanical header file move affecting chrome/browser/
>
> Review URL: https://codereview.chromium.org/62713003
TBR=jamescook@chromium.org
Review URL: https://codereview.chromium.org/66213006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/chrome_notification_observer.cc')
| -rw-r--r-- | chrome/browser/extensions/chrome_notification_observer.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/chrome_notification_observer.cc b/chrome/browser/extensions/chrome_notification_observer.cc index af7f796..9327e52 100644 --- a/chrome/browser/extensions/chrome_notification_observer.cc +++ b/chrome/browser/extensions/chrome_notification_observer.cc @@ -6,16 +6,16 @@ #include "base/logging.h" #include "chrome/browser/chrome_notification_types.h" +#include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "content/public/browser/notification_service.h" -#include "extensions/browser/process_manager.h" namespace extensions { ChromeNotificationObserver::ChromeNotificationObserver() { - // Notifications for extensions::ProcessManager + // Notifications for ExtensionProcessManager registrar_.Add(this, chrome::NOTIFICATION_BROWSER_WINDOW_READY, content::NotificationService::AllSources()); } @@ -29,7 +29,7 @@ void ChromeNotificationObserver::OnBrowserWindowReady(Browser* browser) { // Inform the process manager for this profile that the window is ready. // We continue to observe the notification in case browser windows open for // a related incognito profile or other regular profiles. - extensions::ProcessManager* manager = + ExtensionProcessManager* manager = ExtensionSystem::Get(profile)->process_manager(); if (!manager) // Tests may not have a process manager. return; @@ -42,7 +42,7 @@ void ChromeNotificationObserver::OnBrowserWindowReady(Browser* browser) { // non-incognito window opened. if (profile->IsOffTheRecord()) { Profile* original_profile = profile->GetOriginalProfile(); - extensions::ProcessManager* original_manager = + ExtensionProcessManager* original_manager = ExtensionSystem::Get(original_profile)->process_manager(); DCHECK(original_manager); DCHECK_EQ(original_profile, original_manager->GetBrowserContext()); |