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/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
985 : delegate_(delegate), | 985 : delegate_(delegate), |
986 is_browser_mode_(is_browser_mode), | 986 is_browser_mode_(is_browser_mode), |
987 refreshing_menu_(false), | 987 refreshing_menu_(false), |
988 menu_item_view_(NULL), | 988 menu_item_view_(NULL), |
989 min_width_(kDefaultMinimumWidth) { | 989 min_width_(kDefaultMinimumWidth) { |
990 main_menu_model_.reset(new MainMenuModel(this)); | 990 main_menu_model_.reset(new MainMenuModel(this)); |
991 menu_model_adapter_.reset( | 991 menu_model_adapter_.reset( |
992 new views::MenuModelAdapter(main_menu_model_.get())); | 992 new views::MenuModelAdapter(main_menu_model_.get())); |
993 menu_item_view_ = new views::MenuItemView(menu_model_adapter_.get()); | 993 menu_item_view_ = new views::MenuItemView(menu_model_adapter_.get()); |
994 menu_item_view_->set_has_icons(true); | 994 menu_item_view_->set_has_icons(true); |
| 995 #if !defined(USE_AURA) |
995 menu_item_view_->set_menu_position( | 996 menu_item_view_->set_menu_position( |
996 views::MenuItemView::POSITION_BELOW_BOUNDS); | 997 views::MenuItemView::POSITION_BELOW_BOUNDS); |
| 998 #endif |
997 menu_runner_.reset(new views::MenuRunner(menu_item_view_)); | 999 menu_runner_.reset(new views::MenuRunner(menu_item_view_)); |
998 } | 1000 } |
999 | 1001 |
1000 NetworkMenu::~NetworkMenu() { | 1002 NetworkMenu::~NetworkMenu() { |
1001 } | 1003 } |
1002 | 1004 |
1003 ui::MenuModel* NetworkMenu::GetMenuModel() { | 1005 ui::MenuModel* NetworkMenu::GetMenuModel() { |
1004 return main_menu_model_.get(); | 1006 return main_menu_model_.get(); |
1005 } | 1007 } |
1006 | 1008 |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1051 std::string page = StringPrintf( | 1053 std::string page = StringPrintf( |
1052 "%s?servicePath=%s&networkType=%d&networkName=%s", | 1054 "%s?servicePath=%s&networkType=%d&networkName=%s", |
1053 chrome::kInternetOptionsSubPage, | 1055 chrome::kInternetOptionsSubPage, |
1054 net::EscapeUrlEncodedData(network->service_path(), true).c_str(), | 1056 net::EscapeUrlEncodedData(network->service_path(), true).c_str(), |
1055 network->type(), | 1057 network->type(), |
1056 net::EscapeUrlEncodedData(network_name, false).c_str()); | 1058 net::EscapeUrlEncodedData(network_name, false).c_str()); |
1057 browser->ShowOptionsTab(page); | 1059 browser->ShowOptionsTab(page); |
1058 } | 1060 } |
1059 | 1061 |
1060 } // namespace chromeos | 1062 } // namespace chromeos |
OLD | NEW |