OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_CHROMEOS_FRAME_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_ |
6 #define CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 10 matching lines...) Expand all Loading... |
21 | 21 |
22 namespace ui { | 22 namespace ui { |
23 class SimpleMenuModel; | 23 class SimpleMenuModel; |
24 } // namespace ui | 24 } // namespace ui |
25 | 25 |
26 namespace views { | 26 namespace views { |
27 class ImageButton; | 27 class ImageButton; |
28 class ImageView; | 28 class ImageView; |
29 class MenuDelegate; | 29 class MenuDelegate; |
30 class MenuItemView; | 30 class MenuItemView; |
| 31 class MenuRunner; |
31 } // namespace views | 32 } // namespace views |
32 | 33 |
33 namespace chromeos { | 34 namespace chromeos { |
34 | 35 |
35 class LayoutModeButton; | 36 class LayoutModeButton; |
36 class StatusAreaView; | 37 class StatusAreaView; |
37 class StatusAreaButton; | 38 class StatusAreaButton; |
38 | 39 |
39 // chromeos::BrowserView adds ChromeOS specific controls and menus to a | 40 // chromeos::BrowserView adds ChromeOS specific controls and menus to a |
40 // BrowserView created with Browser::TYPE_TABBED. This extender adds controls | 41 // BrowserView created with Browser::TYPE_TABBED. This extender adds controls |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 void FetchHideStatusAreaProperty(); | 123 void FetchHideStatusAreaProperty(); |
123 | 124 |
124 // Updates |should_show_layout_mode_button_|. Changes won't be visible | 125 // Updates |should_show_layout_mode_button_|. Changes won't be visible |
125 // onscreen until Layout() is called. | 126 // onscreen until Layout() is called. |
126 void UpdateLayoutModeButtonVisibility(); | 127 void UpdateLayoutModeButtonVisibility(); |
127 | 128 |
128 StatusAreaView* status_area_; | 129 StatusAreaView* status_area_; |
129 LayoutModeButton* layout_mode_button_; | 130 LayoutModeButton* layout_mode_button_; |
130 | 131 |
131 // System menu. | 132 // System menu. |
132 scoped_ptr<views::MenuItemView> system_menu_; | 133 scoped_ptr<views::MenuRunner> system_menu_runner_; |
133 scoped_ptr<views::MenuDelegate> system_menu_delegate_; | 134 scoped_ptr<views::MenuDelegate> system_menu_delegate_; |
134 | 135 |
135 // Focused native widget before wrench menu shows up. We need this to properly | 136 // Focused native widget before wrench menu shows up. We need this to properly |
136 // perform cut, copy and paste. See http://crosbug.com/8496 | 137 // perform cut, copy and paste. See http://crosbug.com/8496 |
137 gfx::NativeView saved_focused_widget_; | 138 gfx::NativeView saved_focused_widget_; |
138 | 139 |
139 // Is the _CHROME_STATE_STATUS_HIDDEN atom present in our toplevel window's | 140 // Is the _CHROME_STATE_STATUS_HIDDEN atom present in our toplevel window's |
140 // _CHROME_STATE X property? This gets set by window manager to tell us to | 141 // _CHROME_STATE X property? This gets set by window manager to tell us to |
141 // hide the status area. | 142 // hide the status area. |
142 bool has_hide_status_area_property_; | 143 bool has_hide_status_area_property_; |
143 | 144 |
144 // Should the layout mode button be shown? We only show it if there are | 145 // Should the layout mode button be shown? We only show it if there are |
145 // multiple browsers open. | 146 // multiple browsers open. |
146 bool should_show_layout_mode_button_; | 147 bool should_show_layout_mode_button_; |
147 | 148 |
148 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 149 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
149 }; | 150 }; |
150 | 151 |
151 } // namespace chromeos | 152 } // namespace chromeos |
152 | 153 |
153 #endif // CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_ | 154 #endif // CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_ |
OLD | NEW |