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

Unified Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 8633012: [cros] Return proxy-settings back to the network menu list for OOBE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/network_dropdown.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/status/network_menu.cc
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index fad447f4be666e14144845f84d378dcd1a48cdd0..8fbc4bfe559317a593b47966e8e1108bd8d13a86 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -907,19 +907,17 @@ void MoreMenuModel::InitMenuItems(bool should_open_button_options) {
MenuItemVector address_items;
NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
- bool oobe = !should_open_button_options; // we don't show options for OOBE.
bool connected = cros->Connected(); // always call for test expectations.
- if (!oobe) {
- int message_id = -1;
- if (StatusAreaViewChromeos::IsBrowserMode())
- message_id = IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG;
- else if (connected)
- message_id = IDS_STATUSBAR_NETWORK_OPEN_PROXY_SETTINGS_DIALOG;
- if (message_id != -1) {
- link_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
- l10n_util::GetStringUTF16(message_id),
- SkBitmap(), std::string(), FLAG_OPTIONS));
- }
+
+ int message_id = -1;
+ if (StatusAreaViewChromeos::IsBrowserMode())
+ message_id = IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG;
+ else if (connected)
+ message_id = IDS_STATUSBAR_NETWORK_OPEN_PROXY_SETTINGS_DIALOG;
+ if (message_id != -1) {
+ link_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
+ l10n_util::GetStringUTF16(message_id),
+ SkBitmap(), std::string(), FLAG_OPTIONS));
}
if (connected) {
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/network_dropdown.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698