| 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_WM_WORKSPACE_CONTROLLER_H_ | 5 #ifndef ASH_WM_WORKSPACE_CONTROLLER_H_ |
| 6 #define ASH_WM_WORKSPACE_CONTROLLER_H_ | 6 #define ASH_WM_WORKSPACE_CONTROLLER_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "ash/ash_export.h" | 9 #include "ash/ash_export.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 WorkspaceManager* workspace_manager() { | 51 WorkspaceManager* workspace_manager() { |
| 52 return workspace_manager_.get(); | 52 return workspace_manager_.get(); |
| 53 } | 53 } |
| 54 | 54 |
| 55 // Shows the menu allowing you to configure various aspects of workspaces. | 55 // Shows the menu allowing you to configure various aspects of workspaces. |
| 56 void ShowMenu(views::Widget* widget, const gfx::Point& location); | 56 void ShowMenu(views::Widget* widget, const gfx::Point& location); |
| 57 | 57 |
| 58 // aura::RootWindowObserver overrides: | 58 // aura::RootWindowObserver overrides: |
| 59 virtual void OnRootWindowResized(const gfx::Size& new_size) OVERRIDE; | 59 virtual void OnRootWindowResized(const gfx::Size& new_size) OVERRIDE; |
| 60 | 60 |
| 61 // aura::RootWindowObserver overrides: |
| 62 virtual void OnScreenWorkAreaInsetsChanged() OVERRIDE; |
| 63 |
| 61 // aura::WindowObserver overrides: | 64 // aura::WindowObserver overrides: |
| 62 virtual void OnWindowPropertyChanged(aura::Window* window, | 65 virtual void OnWindowPropertyChanged(aura::Window* window, |
| 63 const void* key, | 66 const void* key, |
| 64 intptr_t old) OVERRIDE; | 67 intptr_t old) OVERRIDE; |
| 65 | 68 |
| 66 // ui::SimpleMenuModel::Delegate overrides: | 69 // ui::SimpleMenuModel::Delegate overrides: |
| 67 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; | 70 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; |
| 68 virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; | 71 virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; |
| 69 virtual void ExecuteCommand(int command_id) OVERRIDE; | 72 virtual void ExecuteCommand(int command_id) OVERRIDE; |
| 70 virtual bool GetAcceleratorForCommandId( | 73 virtual bool GetAcceleratorForCommandId( |
| (...skipping 19 matching lines...) Expand all Loading... |
| 90 scoped_ptr<views::MenuRunner> menu_runner_; | 93 scoped_ptr<views::MenuRunner> menu_runner_; |
| 91 #endif | 94 #endif |
| 92 | 95 |
| 93 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); | 96 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); |
| 94 }; | 97 }; |
| 95 | 98 |
| 96 } // namespace internal | 99 } // namespace internal |
| 97 } // namespace ash | 100 } // namespace ash |
| 98 | 101 |
| 99 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ | 102 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ |
| OLD | NEW |