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

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

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unneeded include in chrome_shell_delegate.cc 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.h
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index 6aafa9a9dad61a2c717cb2cccbf4bba26b050eb0..ad08f8b13cb09d52ea87c8940a47e4ead462c80a 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
#define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
-#include "apps/app_window_registry.h"
#include "ash/ime/input_method_menu_manager.h"
#include "ash/session/session_state_observer.h"
#include "ash/system/tray/system_tray.h"
@@ -30,6 +29,7 @@
#include "content/public/browser/notification_registrar.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_discovery_session.h"
+#include "extensions/browser/app_window/app_window_registry.h"
namespace chromeos {
@@ -45,7 +45,7 @@ class SystemTrayDelegateChromeOS
public policy::CloudPolicyStore::Observer,
public ash::SessionStateObserver,
public chrome::BrowserListObserver,
- public apps::AppWindowRegistry::Observer {
+ public extensions::AppWindowRegistry::Observer {
public:
SystemTrayDelegateChromeOS();
@@ -229,8 +229,8 @@ class SystemTrayDelegateChromeOS
// Overridden from chrome::BrowserListObserver:
virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
- // Overridden from apps::AppWindowRegistry::Observer:
- virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE;
+ // Overridden from extensions::AppWindowRegistry::Observer:
+ virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE;
void OnAccessibilityStatusChanged(
const AccessibilityStatusEventDetails& details);

Powered by Google App Engine
This is Rietveld 408576698