| 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 ASH_SHELL_H_ | 5 #ifndef ASH_SHELL_H_ |
| 6 #define ASH_SHELL_H_ | 6 #define ASH_SHELL_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 // Creates a default views::NonClientFrameView for use by windows in the | 144 // Creates a default views::NonClientFrameView for use by windows in the |
| 145 // Ash environment. | 145 // Ash environment. |
| 146 views::NonClientFrameView* CreateDefaultNonClientFrameView( | 146 views::NonClientFrameView* CreateDefaultNonClientFrameView( |
| 147 views::Widget* widget); | 147 views::Widget* widget); |
| 148 | 148 |
| 149 // Rotate focus through containers that can receive focus. | 149 // Rotate focus through containers that can receive focus. |
| 150 void RotateFocus(Direction direction); | 150 void RotateFocus(Direction direction); |
| 151 | 151 |
| 152 // Sets the work area insets of the monitor that contains |window|, | 152 // Sets the work area insets of the monitor that contains |window|, |
| 153 // this notifies observers too. | 153 // this notifies observers too. |
| 154 // TODO(sky): this no longer really replicates what happens and is unreliable. |
| 155 // Remove this. |
| 154 void SetMonitorWorkAreaInsets(aura::Window* window, | 156 void SetMonitorWorkAreaInsets(aura::Window* window, |
| 155 const gfx::Insets& insets); | 157 const gfx::Insets& insets); |
| 156 | 158 |
| 157 // Add/remove observer. | 159 // Add/remove observer. |
| 158 void AddShellObserver(ShellObserver* observer); | 160 void AddShellObserver(ShellObserver* observer); |
| 159 void RemoveShellObserver(ShellObserver* observer); | 161 void RemoveShellObserver(ShellObserver* observer); |
| 160 | 162 |
| 161 #if !defined(OS_MACOSX) | 163 #if !defined(OS_MACOSX) |
| 162 AcceleratorController* accelerator_controller() { | 164 AcceleratorController* accelerator_controller() { |
| 163 return accelerator_controller_.get(); | 165 return accelerator_controller_.get(); |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for | 305 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for |
| 304 // |status_widget_|). | 306 // |status_widget_|). |
| 305 scoped_ptr<SystemTray> tray_; | 307 scoped_ptr<SystemTray> tray_; |
| 306 | 308 |
| 307 DISALLOW_COPY_AND_ASSIGN(Shell); | 309 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 308 }; | 310 }; |
| 309 | 311 |
| 310 } // namespace ash | 312 } // namespace ash |
| 311 | 313 |
| 312 #endif // ASH_SHELL_H_ | 314 #endif // ASH_SHELL_H_ |
| OLD | NEW |