Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(745)

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index 7051a1d74ff60a524e37fddb461a564cc21ffc8f..e2e2275c2405f6aea6584433d40414794c706cc5 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -870,7 +870,7 @@ void SystemTrayDelegateChromeOS::SetProfile(Profile* profile) {
user_profile_ = profile;
// Start observing the AppWindowRegistry of the newly set |user_profile_|.
- apps::AppWindowRegistry::Get(user_profile_)->AddObserver(this);
+ extensions::AppWindowRegistry::Get(user_profile_)->AddObserver(this);
PrefService* prefs = profile->GetPrefs();
user_pref_registrar_.reset(new PrefChangeRegistrar);
@@ -1012,9 +1012,9 @@ void SystemTrayDelegateChromeOS::StopObservingAppWindowRegistry() {
if (!user_profile_)
return;
- apps::AppWindowRegistry* registry =
- apps::AppWindowRegistry::Factory::GetForBrowserContext(user_profile_,
- false);
+ extensions::AppWindowRegistry* registry =
+ extensions::AppWindowRegistry::Factory::GetForBrowserContext(
+ user_profile_, false);
if (registry)
registry->RemoveObserver(this);
}
@@ -1034,7 +1034,8 @@ void SystemTrayDelegateChromeOS::NotifyIfLastWindowClosed() {
}
}
- if (!apps::AppWindowRegistry::Get(user_profile_)->app_windows().empty()) {
+ if (!extensions::AppWindowRegistry::Get(
+ user_profile_)->app_windows().empty()) {
// The current user has at least one open app window.
return;
}
@@ -1280,9 +1281,9 @@ void SystemTrayDelegateChromeOS::OnBrowserRemoved(Browser* browser) {
NotifyIfLastWindowClosed();
}
-// Overridden from apps::AppWindowRegistry::Observer.
+// Overridden from extensions::AppWindowRegistry::Observer.
void SystemTrayDelegateChromeOS::OnAppWindowRemoved(
- apps::AppWindow* app_window) {
+ extensions::AppWindow* app_window) {
NotifyIfLastWindowClosed();
}

Powered by Google App Engine
This is Rietveld 408576698