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

Side by Side Diff: chrome/browser/ui/panels/panel_browser_frame_view.h

Issue 7720012: Moves ownership of MenuItemView to MenuRunner as well as responbility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test Created 9 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) 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_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "chrome/browser/extensions/extension_uninstall_dialog.h" 12 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
13 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 13 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
14 #include "chrome/browser/ui/views/tab_icon_view.h" 14 #include "chrome/browser/ui/views/tab_icon_view.h"
15 #include "ui/base/models/simple_menu_model.h" 15 #include "ui/base/models/simple_menu_model.h"
16 #include "views/controls/button/button.h" 16 #include "views/controls/button/button.h"
17 #include "views/controls/menu/menu_item_view.h" 17 #include "views/controls/menu/menu_item_view.h"
18 #include "views/controls/menu/menu_model_adapter.h" 18 #include "views/controls/menu/menu_model_adapter.h"
19 #include "views/controls/menu/menu_runner.h"
19 #include "views/controls/menu/view_menu_delegate.h" 20 #include "views/controls/menu/view_menu_delegate.h"
20 21
21 class Extension; 22 class Extension;
22 class PanelBrowserView; 23 class PanelBrowserView;
23 namespace views { 24 namespace views {
24 class ImageButton; 25 class ImageButton;
25 class Label; 26 class Label;
26 class MenuButton; 27 class MenuButton;
27 } 28 }
28 29
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 PaintState paint_state_; 187 PaintState paint_state_;
187 views::MenuButton* settings_button_; 188 views::MenuButton* settings_button_;
188 bool is_settings_button_visible_; 189 bool is_settings_button_visible_;
189 views::ImageButton* close_button_; 190 views::ImageButton* close_button_;
190 TabIconView* title_icon_; 191 TabIconView* title_icon_;
191 views::Label* title_label_; 192 views::Label* title_label_;
192 gfx::Rect client_view_bounds_; 193 gfx::Rect client_view_bounds_;
193 scoped_ptr<MouseWatcher> mouse_watcher_; 194 scoped_ptr<MouseWatcher> mouse_watcher_;
194 ui::SimpleMenuModel settings_menu_contents_; 195 ui::SimpleMenuModel settings_menu_contents_;
195 views::MenuModelAdapter settings_menu_adapter_; 196 views::MenuModelAdapter settings_menu_adapter_;
196 views::MenuItemView settings_menu_; 197 // Owned by |settings_menu_runner_|.
198 views::MenuItemView* settings_menu_;
199 views::MenuRunner settings_menu_runner_;
197 scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_; 200 scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_;
198 201
199 DISALLOW_COPY_AND_ASSIGN(PanelBrowserFrameView); 202 DISALLOW_COPY_AND_ASSIGN(PanelBrowserFrameView);
200 }; 203 };
201 204
202 #endif // CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_ 205 #endif // CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698