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 APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_ | 5 #ifndef APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_ |
6 #define APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_ | 6 #define APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_ |
7 | 7 |
8 #include "apps/ui/native_app_window.h" | 8 #include "apps/app_window.h" |
9 #include "base/observer_list.h" | 9 #include "base/observer_list.h" |
10 #include "content/public/browser/web_contents_observer.h" | 10 #include "content/public/browser/web_contents_observer.h" |
| 11 #include "extensions/browser/app_window/native_app_window.h" |
11 #include "extensions/browser/app_window/size_constraints.h" | 12 #include "extensions/browser/app_window/size_constraints.h" |
12 #include "ui/gfx/rect.h" | 13 #include "ui/gfx/rect.h" |
13 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" | 14 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" |
14 #include "ui/views/widget/widget.h" | 15 #include "ui/views/widget/widget.h" |
15 #include "ui/views/widget/widget_delegate.h" | 16 #include "ui/views/widget/widget_delegate.h" |
16 #include "ui/views/widget/widget_observer.h" | 17 #include "ui/views/widget/widget_observer.h" |
17 | 18 |
18 class SkRegion; | 19 class SkRegion; |
19 | 20 |
20 namespace content { | 21 namespace content { |
(...skipping 14 matching lines...) Expand all Loading... |
35 class MenuRunner; | 36 class MenuRunner; |
36 class WebView; | 37 class WebView; |
37 } | 38 } |
38 | 39 |
39 namespace apps { | 40 namespace apps { |
40 | 41 |
41 class AppWindowFrameView; | 42 class AppWindowFrameView; |
42 | 43 |
43 // A NativeAppWindow backed by a views::Widget. This class may be used alone | 44 // A NativeAppWindow backed by a views::Widget. This class may be used alone |
44 // as a stub or subclassed (for example, ChromeNativeAppWindowViews). | 45 // as a stub or subclassed (for example, ChromeNativeAppWindowViews). |
45 class NativeAppWindowViews : public NativeAppWindow, | 46 class NativeAppWindowViews : public extensions::NativeAppWindow, |
46 public content::WebContentsObserver, | 47 public content::WebContentsObserver, |
47 public views::WidgetDelegateView, | 48 public views::WidgetDelegateView, |
48 public views::WidgetObserver { | 49 public views::WidgetObserver { |
49 public: | 50 public: |
50 NativeAppWindowViews(); | 51 NativeAppWindowViews(); |
51 virtual ~NativeAppWindowViews(); | 52 virtual ~NativeAppWindowViews(); |
52 void Init(AppWindow* app_window, | 53 void Init(AppWindow* app_window, |
53 const AppWindow::CreateParams& create_params); | 54 const AppWindow::CreateParams& create_params); |
54 | 55 |
55 // Signal that CanHaveTransparentBackground has changed. | 56 // Signal that CanHaveTransparentBackground has changed. |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; | 188 views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; |
188 | 189 |
189 ObserverList<web_modal::ModalDialogHostObserver> observer_list_; | 190 ObserverList<web_modal::ModalDialogHostObserver> observer_list_; |
190 | 191 |
191 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews); | 192 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews); |
192 }; | 193 }; |
193 | 194 |
194 } // namespace apps | 195 } // namespace apps |
195 | 196 |
196 #endif // APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_ | 197 #endif // APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_ |
OLD | NEW |