| 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 #if defined(USE_ASH) | 12 #if defined(USE_ASH) |
| 13 namespace ash { | 13 namespace ash { |
| 14 class ImmersiveFullscreenController; | 14 class ImmersiveFullscreenController; |
| 15 } | 15 } |
| 16 #endif | 16 #endif |
| 17 | 17 |
| 18 class ExtensionKeybindingRegistryViews; | 18 class ExtensionKeybindingRegistryViews; |
| 19 | 19 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 immersive_fullscreen_controller_; | 107 immersive_fullscreen_controller_; |
| 108 #endif // defined(USE_ASH) | 108 #endif // defined(USE_ASH) |
| 109 | 109 |
| 110 // Used to show the system menu. | 110 // Used to show the system menu. |
| 111 scoped_ptr<views::MenuRunner> menu_runner_; | 111 scoped_ptr<views::MenuRunner> menu_runner_; |
| 112 | 112 |
| 113 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViews); | 113 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViews); |
| 114 }; | 114 }; |
| 115 | 115 |
| 116 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ | 116 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ |
| OLD | NEW |