Index: chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h |
diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h |
similarity index 51% |
copy from chrome/browser/ui/ash/launcher/app_window_launcher_controller.h |
copy to chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h |
index c4e197930ccec2d413e83f3f52870292f52a2ab6..a34ba49e8379ce2ee02ee70c7e501770ee92e7fa 100644 |
--- a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h |
+++ b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h |
@@ -1,26 +1,22 @@ |
-// Copyright 2014 The Chromium Authors. All rights reserved. |
+// Copyright 2016 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_CONTROLLER_H_ |
-#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_CONTROLLER_H_ |
+#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_CONTROLLER_H_ |
+#define CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_CONTROLLER_H_ |
#include <list> |
#include <map> |
#include <string> |
#include "base/macros.h" |
+#include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" |
#include "extensions/browser/app_window/app_window_registry.h" |
#include "ui/aura/window_observer.h" |
-#include "ui/wm/public/activation_change_observer.h" |
namespace aura { |
class Window; |
- |
-namespace client { |
-class ActivationClient; |
-} |
} |
namespace extensions { |
@@ -29,26 +25,24 @@ class AppWindow; |
class ChromeLauncherController; |
class Profile; |
-class AppWindowLauncherItemController; |
+class ExtensionAppWindowLauncherItemController; |
// AppWindowLauncherController observes the app window registry and the |
// aura window manager. It handles adding and removing launcher items from |
// ChromeLauncherController. |
-class AppWindowLauncherController |
- : public extensions::AppWindowRegistry::Observer, |
- public aura::WindowObserver, |
- public aura::client::ActivationChangeObserver { |
+class ExtensionAppWindowLauncherController |
+ : public AppWindowLauncherController, |
+ public extensions::AppWindowRegistry::Observer, |
+ public aura::WindowObserver { |
public: |
- explicit AppWindowLauncherController(ChromeLauncherController* owner); |
- ~AppWindowLauncherController() override; |
- |
- // Called by ChromeLauncherController when the active user changed and the |
- // items need to be updated. |
- virtual void ActiveUserChanged(const std::string& user_email) {} |
+ explicit ExtensionAppWindowLauncherController( |
+ ChromeLauncherController* owner); |
+ ~ExtensionAppWindowLauncherController() override; |
- // An additional user identified by |Profile|, got added to the existing |
- // session. |
- virtual void AdditionalUserAddedToSession(Profile* profile); |
+ // AppWindowLauncherController: |
+ void AdditionalUserAddedToSession(Profile* profile) override; |
+ AppWindowLauncherItemController* ControllerForWindow( |
+ aura::Window* window) override; |
// Overridden from AppWindowRegistry::Observer: |
void OnAppWindowIconChanged(extensions::AppWindow* app_window) override; |
@@ -59,12 +53,6 @@ class AppWindowLauncherController |
// Overriden from aura::WindowObserver: |
void OnWindowDestroying(aura::Window* window) override; |
- // Overriden from client::ActivationChangeObserver: |
- void OnWindowActivated( |
- aura::client::ActivationChangeObserver::ActivationReason reason, |
- aura::Window* gained_active, |
- aura::Window* lost_active) override; |
- |
protected: |
// Registers a app window with the shelf and this object. |
void RegisterApp(extensions::AppWindow* app_window); |
@@ -76,18 +64,14 @@ class AppWindowLauncherController |
bool IsRegisteredApp(aura::Window* window); |
private: |
- typedef std::map<std::string, AppWindowLauncherItemController*> |
- AppControllerMap; |
- typedef std::map<aura::Window*, std::string> WindowToAppShelfIdMap; |
- |
- AppWindowLauncherItemController* ControllerForWindow(aura::Window* window); |
+ using AppControllerMap = |
+ std::map<std::string, ExtensionAppWindowLauncherItemController*>; |
+ using WindowToAppShelfIdMap = std::map<aura::Window*, std::string>; |
- ChromeLauncherController* owner_; |
// A set of unowned AppWindowRegistry pointers for loaded users. |
// Note that this will only be used with multiple users in the side by side |
// mode. |
std::set<extensions::AppWindowRegistry*> registry_; |
- aura::client::ActivationClient* activation_client_; |
// Map of app launcher id to controller. |
AppControllerMap app_controller_map_; |
@@ -95,7 +79,7 @@ class AppWindowLauncherController |
// Allows us to get from an aura::Window to the app shelf id. |
WindowToAppShelfIdMap window_to_app_shelf_id_map_; |
- DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherController); |
+ DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherController); |
}; |
-#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_CONTROLLER_H_ |
+#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_CONTROLLER_H_ |