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

Side by Side Diff: chrome/browser/ui/ash/shell_utility_window_ash.h

Issue 11363250: Allow Chrome apps to create Ash Panels (apps v2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Multi-icon support 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_ASH_SHELL_UTILITY_WINDOW_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_ 6 #define CHROME_BROWSER_UI_ASH_SHELL_UTILITY_WINDOW_ASH_H_
7 7
8 #include "chrome/browser/ui/base_window.h" 8 #include "base/basictypes.h"
9 #include "base/string16.h"
9 #include "chrome/browser/ui/extensions/native_shell_window.h" 10 #include "chrome/browser/ui/extensions/native_shell_window.h"
10 #include "chrome/browser/ui/extensions/shell_window.h" 11 #include "chrome/browser/ui/extensions/shell_window.h"
11 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" 12 #include "ui/gfx/size.h"
12 #include "third_party/skia/include/core/SkRegion.h" 13 #include "ui/views/controls/native/native_view_host.h"
13 #include "ui/gfx/image/image_skia.h"
14 #include "ui/gfx/rect.h"
15 #include "ui/views/widget/widget_delegate.h" 14 #include "ui/views/widget/widget_delegate.h"
16 15
17 class ExtensionKeybindingRegistryViews; 16 class GURL;
18 class Profile; 17 class Profile;
19 18
20 namespace content { 19 namespace ash {
21 class WebContents; 20 class PanelFrameView;
22 }
23
24 namespace extensions {
25 class Extension;
26 } 21 }
27 22
28 namespace views { 23 namespace views {
29 class WebView; 24 class WebView;
25 class Widget;
30 } 26 }
31 27
32 class ShellWindowViews : public NativeShellWindow, 28 ///////////////////////////////////////////////////////////////////////////////
33 public views::WidgetDelegateView { 29 // ShellUtilityWindowAsh is used to display HTML in a Panel window.
30 //
31 class ShellUtilityWindowAsh : public NativeShellWindow,
sky 2012/11/20 02:05:05 Isn't there a better way to share code here? How
stevenjb 2012/11/20 21:20:58 Probably, yes. I've been thinking about the best w
sky 2012/11/21 00:39:42 I like 3 too. My second question was around wheth
32 public views::WidgetDelegateView {
34 public: 33 public:
35 ShellWindowViews(ShellWindow* shell_window, 34 ShellUtilityWindowAsh(ShellWindow* shell_window,
36 const ShellWindow::CreateParams& params); 35 const ShellWindow::CreateParams& create_params);
37 36 virtual ~ShellUtilityWindowAsh();
38 bool frameless() const { return frameless_; }
39 SkRegion* draggable_region() { return draggable_region_.get(); }
40 37
41 // BaseWindow implementation. 38 // BaseWindow implementation.
42 virtual bool IsActive() const OVERRIDE; 39 virtual bool IsActive() const OVERRIDE;
43 virtual bool IsMaximized() const OVERRIDE; 40 virtual bool IsMaximized() const OVERRIDE;
44 virtual bool IsMinimized() const OVERRIDE; 41 virtual bool IsMinimized() const OVERRIDE;
45 virtual bool IsFullscreen() const OVERRIDE; 42 virtual bool IsFullscreen() const OVERRIDE;
46 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; 43 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
47 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; 44 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
48 virtual gfx::Rect GetBounds() const OVERRIDE; 45 virtual gfx::Rect GetBounds() const OVERRIDE;
49 virtual void Show() OVERRIDE; 46 virtual void Show() OVERRIDE;
50 virtual void ShowInactive() OVERRIDE; 47 virtual void ShowInactive() OVERRIDE;
51 virtual void Hide() OVERRIDE; 48 virtual void Hide() OVERRIDE;
52 virtual void Close() OVERRIDE; 49 virtual void Close() OVERRIDE;
53 virtual void Activate() OVERRIDE; 50 virtual void Activate() OVERRIDE;
54 virtual void Deactivate() OVERRIDE; 51 virtual void Deactivate() OVERRIDE;
55 virtual void Maximize() OVERRIDE; 52 virtual void Maximize() OVERRIDE;
56 virtual void Minimize() OVERRIDE; 53 virtual void Minimize() OVERRIDE;
57 virtual void Restore() OVERRIDE; 54 virtual void Restore() OVERRIDE;
58 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 55 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
59 virtual void FlashFrame(bool flash) OVERRIDE; 56 virtual void FlashFrame(bool flash) OVERRIDE;
60 virtual bool IsAlwaysOnTop() const OVERRIDE; 57 virtual bool IsAlwaysOnTop() const OVERRIDE;
58 // TODO(stevenjb): Make virtual when merging with CL:11369237
59 gfx::Insets GetFrameInsets() const;
61 60
62 // WidgetDelegate implementation. 61 // WidgetDelegate implementation.
63 virtual views::View* GetContentsView() OVERRIDE; 62 virtual views::View* GetContentsView() OVERRIDE;
64 virtual views::NonClientFrameView* CreateNonClientFrameView( 63 virtual views::NonClientFrameView* CreateNonClientFrameView(
65 views::Widget* widget) OVERRIDE; 64 views::Widget* widget) OVERRIDE;
65 virtual void DeleteDelegate() OVERRIDE;
66 virtual bool CanResize() const OVERRIDE; 66 virtual bool CanResize() const OVERRIDE;
67 virtual bool CanMaximize() const OVERRIDE; 67 virtual string16 GetWindowTitle() const OVERRIDE;
68 virtual bool ShouldShowWindowTitle() const OVERRIDE;
68 virtual views::Widget* GetWidget() OVERRIDE; 69 virtual views::Widget* GetWidget() OVERRIDE;
69 virtual const views::Widget* GetWidget() const OVERRIDE; 70 virtual const views::Widget* GetWidget() const OVERRIDE;
70 virtual string16 GetWindowTitle() const OVERRIDE;
71 virtual void DeleteDelegate() OVERRIDE;
72 virtual views::View* GetInitiallyFocusedView() OVERRIDE; 71 virtual views::View* GetInitiallyFocusedView() OVERRIDE;
73 virtual bool ShouldDescendIntoChildForEventHandling(
74 gfx::NativeView child,
75 const gfx::Point& location) OVERRIDE;
76 virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE;
77 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
78 virtual bool ShouldShowWindowTitle() const OVERRIDE;
79 virtual void OnWidgetMove() OVERRIDE;
80 72
81 protected: 73 protected:
82 // views::View implementation. 74 // views::View implementation.
83 virtual void Layout() OVERRIDE; 75 virtual void Layout() OVERRIDE;
84 virtual void ViewHierarchyChanged( 76 virtual void ViewHierarchyChanged(
85 bool is_add, views::View *parent, views::View *child) OVERRIDE; 77 bool is_add, views::View *parent, views::View *child) OVERRIDE;
86 virtual gfx::Size GetMinimumSize() OVERRIDE; 78 virtual gfx::Size GetPreferredSize() OVERRIDE;
87 virtual gfx::Size GetMaximumSize() OVERRIDE;
88 virtual void OnFocus() OVERRIDE; 79 virtual void OnFocus() OVERRIDE;
89 80
90 Profile* profile() { return shell_window_->profile(); }
91 content::WebContents* web_contents() {
92 return shell_window_->web_contents();
93 }
94 const extensions::Extension* extension() {
95 return shell_window_->extension();
96 }
97
98 // views::WidgetDelegate implementation.
99 virtual void SaveWindowPlacement(const gfx::Rect& bounds,
100 ui::WindowShowState show_state) OVERRIDE;
101
102 private: 81 private:
103 friend class ShellWindowFrameView;
104
105 virtual ~ShellWindowViews();
106
107 // NativeShellWindow implementation. 82 // NativeShellWindow implementation.
108 virtual void SetFullscreen(bool fullscreen) OVERRIDE; 83 virtual void SetFullscreen(bool fullscreen) OVERRIDE;
109 virtual bool IsFullscreenOrPending() const OVERRIDE; 84 virtual bool IsFullscreenOrPending() const OVERRIDE;
110 virtual void UpdateWindowIcon() OVERRIDE; 85 virtual void UpdateWindowIcon() OVERRIDE;
111 virtual void UpdateWindowTitle() OVERRIDE; 86 virtual void UpdateWindowTitle() OVERRIDE;
112 virtual void UpdateDraggableRegions( 87 virtual void UpdateDraggableRegions(
113 const std::vector<extensions::DraggableRegion>& regions) OVERRIDE; 88 const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
114 virtual void HandleKeyboardEvent( 89 virtual void HandleKeyboardEvent(
115 const content::NativeWebKeyboardEvent& event) OVERRIDE; 90 const content::NativeWebKeyboardEvent& event) OVERRIDE;
116 virtual void RenderViewHostChanged() OVERRIDE; 91 virtual void RenderViewHostChanged() OVERRIDE;
117 92
118 void OnViewWasResized(); 93 ShellWindow* shell_window_; // weak - ShellWindow owns this
94 views::WebView* web_view_;
95 views::Widget* window_; // Unowned
96 ash::PanelFrameView* panel_frame_view_; // Unowned
97 gfx::Size preferred_size_;
98 bool frameless_;
119 99
120 ShellWindow* shell_window_; // weak - ShellWindow owns NativeShellWindow. 100 DISALLOW_COPY_AND_ASSIGN(ShellUtilityWindowAsh);
121
122 views::WebView* web_view_;
123 views::Widget* window_;
124 bool is_fullscreen_;
125
126 scoped_ptr<SkRegion> draggable_region_;
127
128 bool frameless_;
129 gfx::Size minimum_size_;
130 gfx::Size maximum_size_;
131
132 // The class that registers for keyboard shortcuts for extension commands.
133 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
134
135 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
136
137 DISALLOW_COPY_AND_ASSIGN(ShellWindowViews);
138 }; 101 };
139 102
140 #endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_ 103 #endif // CHROME_BROWSER_UI_ASH_SHELL_UTILITY_WINDOW_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698