| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ | 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ |
| 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ | 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 public aura::WindowTreeHostObserver { | 62 public aura::WindowTreeHostObserver { |
| 63 public: | 63 public: |
| 64 ShellDesktopController(); | 64 ShellDesktopController(); |
| 65 virtual ~ShellDesktopController(); | 65 virtual ~ShellDesktopController(); |
| 66 | 66 |
| 67 // DesktopController: | 67 // DesktopController: |
| 68 virtual aura::WindowTreeHost* GetHost() override; | 68 virtual aura::WindowTreeHost* GetHost() override; |
| 69 virtual AppWindow* CreateAppWindow(content::BrowserContext* context, | 69 virtual AppWindow* CreateAppWindow(content::BrowserContext* context, |
| 70 const Extension* extension) override; | 70 const Extension* extension) override; |
| 71 virtual void AddAppWindow(aura::Window* window) override; | 71 virtual void AddAppWindow(aura::Window* window) override; |
| 72 virtual void RemoveAppWindow(AppWindow* window) override; |
| 72 virtual void CloseAppWindows() override; | 73 virtual void CloseAppWindows() override; |
| 73 | 74 |
| 74 // aura::client::WindowTreeClient overrides: | 75 // aura::client::WindowTreeClient overrides: |
| 75 virtual aura::Window* GetDefaultParent(aura::Window* context, | 76 virtual aura::Window* GetDefaultParent(aura::Window* context, |
| 76 aura::Window* window, | 77 aura::Window* window, |
| 77 const gfx::Rect& bounds) override; | 78 const gfx::Rect& bounds) override; |
| 78 | 79 |
| 79 #if defined(OS_CHROMEOS) | 80 #if defined(OS_CHROMEOS) |
| 80 // chromeos::PowerManagerClient::Observer overrides: | 81 // chromeos::PowerManagerClient::Observer overrides: |
| 81 virtual void PowerButtonEventReceived(bool down, | 82 virtual void PowerButtonEventReceived(bool down, |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 | 125 |
| 125 scoped_ptr<wm::CursorManager> cursor_manager_; | 126 scoped_ptr<wm::CursorManager> cursor_manager_; |
| 126 | 127 |
| 127 scoped_ptr<wm::UserActivityDetector> user_activity_detector_; | 128 scoped_ptr<wm::UserActivityDetector> user_activity_detector_; |
| 128 #if defined(OS_CHROMEOS) | 129 #if defined(OS_CHROMEOS) |
| 129 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; | 130 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; |
| 130 #endif | 131 #endif |
| 131 | 132 |
| 132 scoped_ptr<AppWindowClient> app_window_client_; | 133 scoped_ptr<AppWindowClient> app_window_client_; |
| 133 | 134 |
| 134 // The desktop supports a single app window. | 135 // NativeAppWindow::Close() deletes the AppWindow. |
| 135 AppWindow* app_window_; // NativeAppWindow::Close() deletes this. | 136 std::vector<AppWindow*> app_windows_; |
| 136 | 137 |
| 137 DISALLOW_COPY_AND_ASSIGN(ShellDesktopController); | 138 DISALLOW_COPY_AND_ASSIGN(ShellDesktopController); |
| 138 }; | 139 }; |
| 139 | 140 |
| 140 } // namespace extensions | 141 } // namespace extensions |
| 141 | 142 |
| 142 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ | 143 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ |
| OLD | NEW |