Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Side by Side Diff: chrome/browser/ui/views/apps/native_app_window_views.h

Issue 21344002: Move native_app_window code to apps areas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to after mac app shim fix Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 CHROME_BROWSER_UI_VIEWS_EXTENSIONS_NATIVE_APP_WINDOW_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_NATIVE_APP_WINDOW_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
7 7
8 #include "apps/native_app_window.h"
8 #include "apps/shell_window.h" 9 #include "apps/shell_window.h"
9 #include "base/observer_list.h" 10 #include "base/observer_list.h"
10 #include "chrome/browser/ui/extensions/native_app_window.h"
11 #include "content/public/browser/web_contents_observer.h" 11 #include "content/public/browser/web_contents_observer.h"
12 #include "third_party/skia/include/core/SkRegion.h" 12 #include "third_party/skia/include/core/SkRegion.h"
13 #include "ui/gfx/image/image_skia.h" 13 #include "ui/gfx/image/image_skia.h"
14 #include "ui/gfx/rect.h" 14 #include "ui/gfx/rect.h"
15 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" 15 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
16 #include "ui/views/widget/widget_delegate.h" 16 #include "ui/views/widget/widget_delegate.h"
17 #include "ui/views/widget/widget_observer.h" 17 #include "ui/views/widget/widget_observer.h"
18 18
19 #if defined(OS_WIN) 19 #if defined(OS_WIN)
20 #include "chrome/browser/shell_integration.h" 20 #include "chrome/browser/shell_integration.h"
21 #endif 21 #endif
22 22
23 class ExtensionKeybindingRegistryViews; 23 class ExtensionKeybindingRegistryViews;
24 class Profile; 24 class Profile;
25 25
26 namespace content { 26 namespace content {
27 class RenderViewHost; 27 class RenderViewHost;
28 class WebContents; 28 class WebContents;
29 } 29 }
30 30
31 namespace extensions { 31 namespace extensions {
32 class Extension; 32 class Extension;
33 } 33 }
34 34
35 namespace views { 35 namespace views {
36 class WebView; 36 class WebView;
37 } 37 }
38 38
39 class NativeAppWindowViews : public NativeAppWindow, 39 class NativeAppWindowViews : public apps::NativeAppWindow,
40 public views::WidgetDelegateView, 40 public views::WidgetDelegateView,
41 public views::WidgetObserver, 41 public views::WidgetObserver,
42 public content::WebContentsObserver { 42 public content::WebContentsObserver {
43 public: 43 public:
44 NativeAppWindowViews(apps::ShellWindow* shell_window, 44 NativeAppWindowViews(apps::ShellWindow* shell_window,
45 const apps::ShellWindow::CreateParams& params); 45 const apps::ShellWindow::CreateParams& params);
46 virtual ~NativeAppWindowViews(); 46 virtual ~NativeAppWindowViews();
47 47
48 bool frameless() const { return frameless_; } 48 bool frameless() const { return frameless_; }
49 SkRegion* draggable_region() { return draggable_region_.get(); } 49 SkRegion* draggable_region() { return draggable_region_.get(); }
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 175
176 views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; 176 views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
177 177
178 base::WeakPtrFactory<NativeAppWindowViews> weak_ptr_factory_; 178 base::WeakPtrFactory<NativeAppWindowViews> weak_ptr_factory_;
179 179
180 ObserverList<web_modal::WebContentsModalDialogHostObserver> observer_list_; 180 ObserverList<web_modal::WebContentsModalDialogHostObserver> observer_list_;
181 181
182 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews); 182 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
183 }; 183 };
184 184
185 #endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_NATIVE_APP_WINDOW_VIEWS_H_ 185 #endif // CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698