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

Side by Side Diff: chrome/browser/chromeos/status/network_menu.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_CHROMEOS_STATUS_NETWORK_MENU_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_
6 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ 6 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 18 matching lines...) Expand all
29 } 29 }
30 30
31 namespace ui { 31 namespace ui {
32 class MenuModel; 32 class MenuModel;
33 } 33 }
34 34
35 namespace views { 35 namespace views {
36 class MenuItemView; 36 class MenuItemView;
37 class MenuButton; 37 class MenuButton;
38 class MenuModelAdapter; 38 class MenuModelAdapter;
39 class MenuRunner;
39 } 40 }
40 41
41 namespace chromeos { 42 namespace chromeos {
42 43
43 class NetworkMenuModel; 44 class NetworkMenuModel;
44 45
45 // Menu for network menu button in the status area/welcome screen. 46 // Menu for network menu button in the status area/welcome screen.
46 // This class will populating the menu with the list of networks. 47 // This class will populating the menu with the list of networks.
47 // It will also handle connecting to another wifi/cellular network. 48 // It will also handle connecting to another wifi/cellular network.
48 // 49 //
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 117
117 // True if the browser is visible (i.e. not login/OOBE). 118 // True if the browser is visible (i.e. not login/OOBE).
118 bool is_browser_mode_; 119 bool is_browser_mode_;
119 120
120 // Set to true if we are currently refreshing the menu. 121 // Set to true if we are currently refreshing the menu.
121 bool refreshing_menu_; 122 bool refreshing_menu_;
122 123
123 // The network menu. 124 // The network menu.
124 scoped_ptr<NetworkMenuModel> main_menu_model_; 125 scoped_ptr<NetworkMenuModel> main_menu_model_;
125 scoped_ptr<views::MenuModelAdapter> menu_model_adapter_; 126 scoped_ptr<views::MenuModelAdapter> menu_model_adapter_;
126 scoped_ptr<views::MenuItemView> menu_item_view_; 127 views::MenuItemView* menu_item_view_;
128 scoped_ptr<views::MenuRunner> menu_runner_;
127 129
128 // Holds minimum width of the menu. 130 // Holds minimum width of the menu.
129 int min_width_; 131 int min_width_;
130 132
131 DISALLOW_COPY_AND_ASSIGN(NetworkMenu); 133 DISALLOW_COPY_AND_ASSIGN(NetworkMenu);
132 }; 134 };
133 135
134 } // namespace chromeos 136 } // namespace chromeos
135 137
136 #endif // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ 138 #endif // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698