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

Side by Side Diff: chrome/browser/ui/views/extensions/shell_window_views.h

Issue 10986092: Transparent apps support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address reviewer's comment Created 8 years, 1 month 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_SHELL_WINDOW_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
7 7
8 #include "chrome/browser/ui/base_window.h" 8 #include "chrome/browser/ui/base_window.h"
9 #include "chrome/browser/ui/extensions/native_shell_window.h" 9 #include "chrome/browser/ui/extensions/native_shell_window.h"
10 #include "chrome/browser/ui/extensions/shell_window.h" 10 #include "chrome/browser/ui/extensions/shell_window.h"
11 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" 11 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
12 #include "content/public/browser/web_contents_observer.h"
12 #include "third_party/skia/include/core/SkRegion.h" 13 #include "third_party/skia/include/core/SkRegion.h"
13 #include "ui/gfx/image/image_skia.h" 14 #include "ui/gfx/image/image_skia.h"
14 #include "ui/gfx/rect.h" 15 #include "ui/gfx/rect.h"
15 #include "ui/views/widget/widget_delegate.h" 16 #include "ui/views/widget/widget_delegate.h"
16 17
17 class ExtensionKeybindingRegistryViews; 18 class ExtensionKeybindingRegistryViews;
18 class Profile; 19 class Profile;
19 20
20 namespace content { 21 namespace content {
22 class RenderViewHost;
21 class WebContents; 23 class WebContents;
22 } 24 }
23 25
24 namespace extensions { 26 namespace extensions {
25 class Extension; 27 class Extension;
26 } 28 }
27 29
28 namespace views { 30 namespace views {
29 class WebView; 31 class WebView;
30 } 32 }
31 33
32 class ShellWindowViews : public NativeShellWindow, 34 class ShellWindowViews : public NativeShellWindow,
33 public views::WidgetDelegateView { 35 public views::WidgetDelegateView,
36 public content::WebContentsObserver {
34 public: 37 public:
35 ShellWindowViews(ShellWindow* shell_window, 38 ShellWindowViews(ShellWindow* shell_window,
36 const ShellWindow::CreateParams& params); 39 const ShellWindow::CreateParams& params);
37 40
38 bool frameless() const { return frameless_; } 41 bool frameless() const { return frameless_; }
39 SkRegion* draggable_region() { return draggable_region_.get(); } 42 SkRegion* draggable_region() { return draggable_region_.get(); }
40 43
41 // BaseWindow implementation. 44 // BaseWindow implementation.
42 virtual bool IsActive() const OVERRIDE; 45 virtual bool IsActive() const OVERRIDE;
43 virtual bool IsMaximized() const OVERRIDE; 46 virtual bool IsMaximized() const OVERRIDE;
(...skipping 27 matching lines...) Expand all
71 virtual void DeleteDelegate() OVERRIDE; 74 virtual void DeleteDelegate() OVERRIDE;
72 virtual views::View* GetInitiallyFocusedView() OVERRIDE; 75 virtual views::View* GetInitiallyFocusedView() OVERRIDE;
73 virtual bool ShouldDescendIntoChildForEventHandling( 76 virtual bool ShouldDescendIntoChildForEventHandling(
74 gfx::NativeView child, 77 gfx::NativeView child,
75 const gfx::Point& location) OVERRIDE; 78 const gfx::Point& location) OVERRIDE;
76 virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE; 79 virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE;
77 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; 80 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
78 virtual bool ShouldShowWindowTitle() const OVERRIDE; 81 virtual bool ShouldShowWindowTitle() const OVERRIDE;
79 virtual void OnWidgetMove() OVERRIDE; 82 virtual void OnWidgetMove() OVERRIDE;
80 83
84 // WebContentsObserver implementation.
85 virtual void RenderViewCreated(
86 content::RenderViewHost* render_view_host) OVERRIDE;
87
81 protected: 88 protected:
82 // views::View implementation. 89 // views::View implementation.
83 virtual void Layout() OVERRIDE; 90 virtual void Layout() OVERRIDE;
84 virtual void ViewHierarchyChanged( 91 virtual void ViewHierarchyChanged(
85 bool is_add, views::View *parent, views::View *child) OVERRIDE; 92 bool is_add, views::View *parent, views::View *child) OVERRIDE;
86 virtual gfx::Size GetMinimumSize() OVERRIDE; 93 virtual gfx::Size GetMinimumSize() OVERRIDE;
87 virtual gfx::Size GetMaximumSize() OVERRIDE; 94 virtual gfx::Size GetMaximumSize() OVERRIDE;
88 virtual void OnFocus() OVERRIDE; 95 virtual void OnFocus() OVERRIDE;
89 96
90 Profile* profile() { return shell_window_->profile(); } 97 Profile* profile() { return shell_window_->profile(); }
(...skipping 27 matching lines...) Expand all
118 void OnViewWasResized(); 125 void OnViewWasResized();
119 126
120 ShellWindow* shell_window_; // weak - ShellWindow owns NativeShellWindow. 127 ShellWindow* shell_window_; // weak - ShellWindow owns NativeShellWindow.
121 128
122 views::WebView* web_view_; 129 views::WebView* web_view_;
123 views::Widget* window_; 130 views::Widget* window_;
124 bool is_fullscreen_; 131 bool is_fullscreen_;
125 132
126 scoped_ptr<SkRegion> draggable_region_; 133 scoped_ptr<SkRegion> draggable_region_;
127 134
128 bool frameless_; 135 const bool frameless_;
136 const bool transparent_background_;
129 gfx::Size minimum_size_; 137 gfx::Size minimum_size_;
130 gfx::Size maximum_size_; 138 gfx::Size maximum_size_;
131 139
132 // The class that registers for keyboard shortcuts for extension commands. 140 // The class that registers for keyboard shortcuts for extension commands.
133 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; 141 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
134 142
135 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; 143 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
136 144
137 DISALLOW_COPY_AND_ASSIGN(ShellWindowViews); 145 DISALLOW_COPY_AND_ASSIGN(ShellWindowViews);
138 }; 146 };
139 147
140 #endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_ 148 #endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698