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 #include "chrome/browser/chromeos/status/network_menu.h" | 5 #include "chrome/browser/chromeos/status/network_menu.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1032 refreshing_menu_(false), | 1032 refreshing_menu_(false), |
1033 menu_item_view_(NULL), | 1033 menu_item_view_(NULL), |
1034 min_width_(kDefaultMinimumWidth) { | 1034 min_width_(kDefaultMinimumWidth) { |
1035 main_menu_model_.reset(new MainMenuModel(this)); | 1035 main_menu_model_.reset(new MainMenuModel(this)); |
1036 menu_model_adapter_.reset( | 1036 menu_model_adapter_.reset( |
1037 new views::MenuModelAdapter(main_menu_model_.get())); | 1037 new views::MenuModelAdapter(main_menu_model_.get())); |
1038 menu_item_view_ = new views::MenuItemView(menu_model_adapter_.get()); | 1038 menu_item_view_ = new views::MenuItemView(menu_model_adapter_.get()); |
1039 menu_item_view_->set_has_icons(true); | 1039 menu_item_view_->set_has_icons(true); |
1040 menu_item_view_->set_menu_position( | 1040 menu_item_view_->set_menu_position( |
1041 views::MenuItemView::POSITION_BELOW_BOUNDS); | 1041 views::MenuItemView::POSITION_BELOW_BOUNDS); |
| 1042 menu_runner_.reset(new views::MenuRunner(menu_item_view_)); |
1042 } | 1043 } |
1043 | 1044 |
1044 NetworkMenu::~NetworkMenu() { | 1045 NetworkMenu::~NetworkMenu() { |
1045 } | 1046 } |
1046 | 1047 |
1047 ui::MenuModel* NetworkMenu::GetMenuModel() { | 1048 ui::MenuModel* NetworkMenu::GetMenuModel() { |
1048 return main_menu_model_.get(); | 1049 return main_menu_model_.get(); |
1049 } | 1050 } |
1050 | 1051 |
1051 void NetworkMenu::CancelMenu() { | 1052 void NetworkMenu::CancelMenu() { |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1095 std::string page = StringPrintf( | 1096 std::string page = StringPrintf( |
1096 "%s?servicePath=%s&networkType=%d&networkName=%s", | 1097 "%s?servicePath=%s&networkType=%d&networkName=%s", |
1097 chrome::kInternetOptionsSubPage, | 1098 chrome::kInternetOptionsSubPage, |
1098 EscapeUrlEncodedData(network->service_path(), true).c_str(), | 1099 EscapeUrlEncodedData(network->service_path(), true).c_str(), |
1099 network->type(), | 1100 network->type(), |
1100 EscapeUrlEncodedData(network_name, false).c_str()); | 1101 EscapeUrlEncodedData(network_name, false).c_str()); |
1101 browser->ShowOptionsTab(page); | 1102 browser->ShowOptionsTab(page); |
1102 } | 1103 } |
1103 | 1104 |
1104 } // namespace chromeos | 1105 } // namespace chromeos |
OLD | NEW |