Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / ash / launcher / chrome_launcher_controller.h

diff --git a/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index 63875f7..e3b234e 100644 (file)
--- a/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -30,8 +30,8 @@
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
-#include "chrome/common/extensions/extension_constants.h"
 #include "extensions/browser/extension_registry_observer.h"
+#include "extensions/common/constants.h"
 #include "ui/aura/window_observer.h"
 
 class AppSyncUIState;
@@ -134,7 +134,7 @@ class ChromeLauncherController : public ash::ShelfDelegate,
   };
 
   ChromeLauncherController(Profile* profile, ash::ShelfModel* model);
-  virtual ~ChromeLauncherController();
+  ~ChromeLauncherController() override;
 
   // Initializes this ChromeLauncherController.
   void Init();
@@ -291,56 +291,54 @@ class ChromeLauncherController : public ash::ShelfDelegate,
                                         bool allow_minimize);
 
   // ash::ShelfDelegate overrides:
-  virtual void OnShelfCreated(ash::Shelf* shelf) OVERRIDE;
-  virtual void OnShelfDestroyed(ash::Shelf* shelf) OVERRIDE;
-  virtual ash::ShelfID GetShelfIDForAppID(const std::string& app_id) OVERRIDE;
-  virtual const std::string& GetAppIDForShelfID(ash::ShelfID id) OVERRIDE;
-  virtual void PinAppWithID(const std::string& app_id) OVERRIDE;
-  virtual bool IsAppPinned(const std::string& app_id) OVERRIDE;
-  virtual bool CanPin() const OVERRIDE;
-  virtual void UnpinAppWithID(const std::string& app_id) OVERRIDE;
+  void OnShelfCreated(ash::Shelf* shelf) override;
+  void OnShelfDestroyed(ash::Shelf* shelf) override;
+  ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override;
+  const std::string& GetAppIDForShelfID(ash::ShelfID id) override;
+  void PinAppWithID(const std::string& app_id) override;
+  bool IsAppPinned(const std::string& app_id) override;
+  bool CanPin() const override;
+  void UnpinAppWithID(const std::string& app_id) override;
 
   // ash::ShelfModelObserver overrides:
-  virtual void ShelfItemAdded(int index) OVERRIDE;
-  virtual void ShelfItemRemoved(int index, ash::ShelfID id) OVERRIDE;
-  virtual void ShelfItemMoved(int start_index, int target_index) OVERRIDE;
-  virtual void ShelfItemChanged(int index,
-                                const ash::ShelfItem& old_item) OVERRIDE;
-  virtual void ShelfStatusChanged() OVERRIDE;
+  void ShelfItemAdded(int index) override;
+  void ShelfItemRemoved(int index, ash::ShelfID id) override;
+  void ShelfItemMoved(int start_index, int target_index) override;
+  void ShelfItemChanged(int index, const ash::ShelfItem& old_item) override;
+  void ShelfStatusChanged() override;
 
   // ash::ShellObserver overrides:
-  virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE;
+  void OnShelfAlignmentChanged(aura::Window* root_window) override;
 
   // ash::DisplayController::Observer overrides:
-  virtual void OnDisplayConfigurationChanged() OVERRIDE;
+  void OnDisplayConfigurationChanged() override;
 
   // ExtensionRegistryObserver overrides:
-  virtual void OnExtensionLoaded(
-      content::BrowserContext* browser_context,
-      const extensions::Extension* extension) OVERRIDE;
-  virtual void OnExtensionUnloaded(
+  void OnExtensionLoaded(content::BrowserContext* browser_context,
+                         const extensions::Extension* extension) override;
+  void OnExtensionUnloaded(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
+      extensions::UnloadedExtensionInfo::Reason reason) override;
 
   // PrefServiceSyncableObserver overrides:
-  virtual void OnIsSyncingChanged() OVERRIDE;
+  void OnIsSyncingChanged() override;
 
   // AppSyncUIStateObserver overrides:
-  virtual void OnAppSyncUIStatusChanged() OVERRIDE;
+  void OnAppSyncUIStatusChanged() override;
 
   // ExtensionEnableFlowDelegate overrides:
-  virtual void ExtensionEnableFlowFinished() OVERRIDE;
-  virtual void ExtensionEnableFlowAborted(bool user_initiated) OVERRIDE;
+  void ExtensionEnableFlowFinished() override;
+  void ExtensionEnableFlowAborted(bool user_initiated) override;
 
   // extensions::AppIconLoader overrides:
-  virtual void SetAppImage(const std::string& app_id,
-                           const gfx::ImageSkia& image) OVERRIDE;
+  void SetAppImage(const std::string& app_id,
+                   const gfx::ImageSkia& image) override;
 
   // ash::ShelfLayoutManagerObserver overrides:
-  virtual void OnAutoHideBehaviorChanged(
+  void OnAutoHideBehaviorChanged(
       aura::Window* root_window,
-      ash::ShelfAutoHideBehavior new_behavior) OVERRIDE;
+      ash::ShelfAutoHideBehavior new_behavior) override;
 
   // Called when the active user has changed.
   void ActiveUserChanged(const std::string& user_email);