Chromium Code Reviews| 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 12 matching lines...) Expand all Loading... | |
| 23 class DefaultCaptureClient; | 23 class DefaultCaptureClient; |
| 24 class FocusClient; | 24 class FocusClient; |
| 25 } | 25 } |
| 26 } | 26 } |
| 27 | 27 |
| 28 namespace content { | 28 namespace content { |
| 29 class BrowserContext; | 29 class BrowserContext; |
| 30 } | 30 } |
| 31 | 31 |
| 32 namespace gfx { | 32 namespace gfx { |
| 33 class Insets; | |
| 33 class Size; | 34 class Size; |
| 34 } | 35 } |
| 35 | 36 |
| 36 #if defined(OS_CHROMEOS) | 37 #if defined(OS_CHROMEOS) |
| 37 namespace ui { | 38 namespace ui { |
| 38 class UserActivityPowerManagerNotifier; | 39 class UserActivityPowerManagerNotifier; |
| 39 } | 40 } |
| 40 #endif | 41 #endif |
| 41 | 42 |
| 42 namespace wm { | 43 namespace wm { |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 78 // |app_window_controller|. | 79 // |app_window_controller|. |
| 79 void SetAppWindowController(ShellAppWindowController* app_window_controller); | 80 void SetAppWindowController(ShellAppWindowController* app_window_controller); |
| 80 | 81 |
| 81 // Creates a new app window and adds it to the desktop. The desktop maintains | 82 // Creates a new app window and adds it to the desktop. The desktop maintains |
| 82 // ownership of the window. | 83 // ownership of the window. |
| 83 ShellAppWindow* CreateAppWindow(content::BrowserContext* context); | 84 ShellAppWindow* CreateAppWindow(content::BrowserContext* context); |
| 84 | 85 |
| 85 // Closes and destroys the app windows. | 86 // Closes and destroys the app windows. |
| 86 void CloseAppWindows(); | 87 void CloseAppWindows(); |
| 87 | 88 |
| 89 #if defined(OS_CHROMEOS) | |
|
oshima
2014/08/14 00:19:02
do you need this ifdef?
I believe the CHROMEOS be
pkotwicz
2014/08/14 15:49:39
Removed the ifdef. Once app shell is for more than
| |
| 90 // Sets the screen's work area insets. | |
|
pkotwicz
2014/08/13 13:48:55
There is no app API for setting the work area boun
oshima
2014/08/14 00:19:02
I was fine with something like this,
static_cast<
| |
| 91 void SetDisplayWorkAreaInsets(const gfx::Insets& insets); | |
| 92 #endif | |
| 93 | |
| 88 // Overridden from aura::client::WindowTreeClient: | 94 // Overridden from aura::client::WindowTreeClient: |
| 89 virtual aura::Window* GetDefaultParent(aura::Window* context, | 95 virtual aura::Window* GetDefaultParent(aura::Window* context, |
| 90 aura::Window* window, | 96 aura::Window* window, |
| 91 const gfx::Rect& bounds) OVERRIDE; | 97 const gfx::Rect& bounds) OVERRIDE; |
| 92 | 98 |
| 93 #if defined(OS_CHROMEOS) | 99 #if defined(OS_CHROMEOS) |
| 94 // ui::DisplayConfigurator::Observer overrides. | 100 // ui::DisplayConfigurator::Observer overrides. |
| 95 virtual void OnDisplayModeChanged(const std::vector< | 101 virtual void OnDisplayModeChanged(const std::vector< |
| 96 ui::DisplayConfigurator::DisplayState>& displays) OVERRIDE; | 102 ui::DisplayConfigurator::DisplayState>& displays) OVERRIDE; |
| 97 #endif | 103 #endif |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 140 | 146 |
| 141 // The desktop supports a single app window. | 147 // The desktop supports a single app window. |
| 142 scoped_ptr<ShellAppWindowController> app_window_controller_; | 148 scoped_ptr<ShellAppWindowController> app_window_controller_; |
| 143 | 149 |
| 144 DISALLOW_COPY_AND_ASSIGN(ShellDesktopController); | 150 DISALLOW_COPY_AND_ASSIGN(ShellDesktopController); |
| 145 }; | 151 }; |
| 146 | 152 |
| 147 } // namespace extensions | 153 } // namespace extensions |
| 148 | 154 |
| 149 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ | 155 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ |
| OLD | NEW |