| 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 CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ |
| 7 | 7 |
| 8 #include "apps/ui/views/native_app_window_views.h" | |
| 9 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "components/native_app_window/native_app_window_views.h" |
| 10 #include "ui/views/context_menu_controller.h" | 10 #include "ui/views/context_menu_controller.h" |
| 11 | 11 |
| 12 namespace apps { |
| 13 class AppWindowFrameView; |
| 14 } |
| 15 |
| 12 #if defined(USE_ASH) | 16 #if defined(USE_ASH) |
| 13 namespace ash { | 17 namespace ash { |
| 14 class ImmersiveFullscreenController; | 18 class ImmersiveFullscreenController; |
| 15 } | 19 } |
| 16 #endif | 20 #endif |
| 17 | 21 |
| 18 class ExtensionKeybindingRegistryViews; | 22 class ExtensionKeybindingRegistryViews; |
| 19 | 23 |
| 20 namespace views { | 24 namespace views { |
| 21 class MenuRunner; | 25 class MenuRunner; |
| 22 } | 26 } |
| 23 | 27 |
| 24 class ChromeNativeAppWindowViews : public apps::NativeAppWindowViews, | 28 class ChromeNativeAppWindowViews |
| 25 public views::ContextMenuController { | 29 : public native_app_window::NativeAppWindowViews, |
| 30 public views::ContextMenuController { |
| 26 public: | 31 public: |
| 27 ChromeNativeAppWindowViews(); | 32 ChromeNativeAppWindowViews(); |
| 28 virtual ~ChromeNativeAppWindowViews(); | 33 virtual ~ChromeNativeAppWindowViews(); |
| 29 | 34 |
| 30 SkRegion* shape() { return shape_.get(); } | 35 SkRegion* shape() { return shape_.get(); } |
| 31 | 36 |
| 32 protected: | 37 protected: |
| 33 // Called before views::Widget::Init() to allow subclasses to customize | 38 // Called before views::Widget::Init() to allow subclasses to customize |
| 34 // the InitParams that would be passed. | 39 // the InitParams that would be passed. |
| 35 virtual void OnBeforeWidgetInit(views::Widget::InitParams* init_params, | 40 virtual void OnBeforeWidgetInit(views::Widget::InitParams* init_params, |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 immersive_fullscreen_controller_; | 112 immersive_fullscreen_controller_; |
| 108 #endif // defined(USE_ASH) | 113 #endif // defined(USE_ASH) |
| 109 | 114 |
| 110 // Used to show the system menu. | 115 // Used to show the system menu. |
| 111 scoped_ptr<views::MenuRunner> menu_runner_; | 116 scoped_ptr<views::MenuRunner> menu_runner_; |
| 112 | 117 |
| 113 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViews); | 118 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViews); |
| 114 }; | 119 }; |
| 115 | 120 |
| 116 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ | 121 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ |
| OLD | NEW |