| OLD | NEW | 
|    1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |    1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|    2 // Use of this source code is governed by a BSD-style license that can be |    2 // Use of this source code is governed by a BSD-style license that can be | 
|    3 // found in the LICENSE file. |    3 // found in the LICENSE file. | 
|    4  |    4  | 
|    5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |    5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 
|    6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |    6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 
|    7  |    7  | 
|    8 #include <string> |    8 #include <string> | 
|    9  |    9  | 
|   10 #include "ash/shelf/shelf_item_types.h" |   10 #include "ash/shelf/shelf_item_types.h" | 
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   55   bool IsForceMaximizeOnFirstRun() const override; |   55   bool IsForceMaximizeOnFirstRun() const override; | 
|   56   void PreInit() override; |   56   void PreInit() override; | 
|   57   void PreShutdown() override; |   57   void PreShutdown() override; | 
|   58   void Exit() override; |   58   void Exit() override; | 
|   59   keyboard::KeyboardUI* CreateKeyboardUI() override; |   59   keyboard::KeyboardUI* CreateKeyboardUI() override; | 
|   60   void VirtualKeyboardActivated(bool activated) override; |   60   void VirtualKeyboardActivated(bool activated) override; | 
|   61   void AddVirtualKeyboardStateObserver( |   61   void AddVirtualKeyboardStateObserver( | 
|   62       ash::VirtualKeyboardStateObserver* observer) override; |   62       ash::VirtualKeyboardStateObserver* observer) override; | 
|   63   void RemoveVirtualKeyboardStateObserver( |   63   void RemoveVirtualKeyboardStateObserver( | 
|   64       ash::VirtualKeyboardStateObserver* observer) override; |   64       ash::VirtualKeyboardStateObserver* observer) override; | 
|   65   app_list::AppListViewDelegate* GetAppListViewDelegate() override; |   65   app_list::AppListController* GetAppListController() override; | 
|   66   ash::ShelfDelegate* CreateShelfDelegate(ash::ShelfModel* model) override; |   66   ash::ShelfDelegate* CreateShelfDelegate(ash::ShelfModel* model) override; | 
|   67   ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; |   67   ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; | 
|   68   ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; |   68   ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; | 
|   69   ash::SessionStateDelegate* CreateSessionStateDelegate() override; |   69   ash::SessionStateDelegate* CreateSessionStateDelegate() override; | 
|   70   ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; |   70   ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; | 
|   71   ash::NewWindowDelegate* CreateNewWindowDelegate() override; |   71   ash::NewWindowDelegate* CreateNewWindowDelegate() override; | 
|   72   ash::MediaDelegate* CreateMediaDelegate() override; |   72   ash::MediaDelegate* CreateMediaDelegate() override; | 
|   73   ui::MenuModel* CreateContextMenu(aura::Window* root, |   73   ui::MenuModel* CreateContextMenu(aura::Window* root, | 
|   74                                    ash::ShelfItemDelegate* item_delegate, |   74                                    ash::ShelfItemDelegate* item_delegate, | 
|   75                                    ash::ShelfItem* item) override; |   75                                    ash::ShelfItem* item) override; | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
|  100  |  100  | 
|  101 #if defined(OS_CHROMEOS) |  101 #if defined(OS_CHROMEOS) | 
|  102   scoped_ptr<chromeos::DisplayConfigurationObserver> |  102   scoped_ptr<chromeos::DisplayConfigurationObserver> | 
|  103       display_configuration_observer_; |  103       display_configuration_observer_; | 
|  104 #endif |  104 #endif | 
|  105  |  105  | 
|  106   DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); |  106   DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); | 
|  107 }; |  107 }; | 
|  108  |  108  | 
|  109 #endif  // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |  109 #endif  // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 
| OLD | NEW |