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

Side by Side Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 4324001: Add proxy settings to network control at upper row of controls at login screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 // menu_items_.push_back(MenuItem(cros->offline_mode() ? 595 // menu_items_.push_back(MenuItem(cros->offline_mode() ?
596 // menus::MenuModel::TYPE_CHECK : menus::MenuModel::TYPE_COMMAND, 596 // menus::MenuModel::TYPE_CHECK : menus::MenuModel::TYPE_COMMAND,
597 // l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OFFLINE_MODE), 597 // l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OFFLINE_MODE),
598 // SkBitmap(), std::string(), FLAG_TOGGLE_OFFLINE)); 598 // SkBitmap(), std::string(), FLAG_TOGGLE_OFFLINE));
599 599
600 // Network settings. 600 // Network settings.
601 if (ShouldOpenButtonOptions()) { 601 if (ShouldOpenButtonOptions()) {
602 // Separator. 602 // Separator.
603 menu_items_.push_back(MenuItem()); 603 menu_items_.push_back(MenuItem());
604 604
605 label = 605 if (IsBrowserMode()) {
606 l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG); 606 label = l10n_util::GetStringUTF16(
607 IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG);
608 } else {
609 label = l10n_util::GetStringUTF16(
610 IDS_STATUSBAR_NETWORK_OPEN_PROXY_SETTINGS_DIALOG);
611 }
607 menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label, 612 menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
608 SkBitmap(), std::string(), FLAG_OPTIONS)); 613 SkBitmap(), std::string(), FLAG_OPTIONS));
609 } 614 }
610 } 615 }
611 616
612 void NetworkMenu::ShowTabbedNetworkSettings(const Network* network) const { 617 void NetworkMenu::ShowTabbedNetworkSettings(const Network* network) const {
613 DCHECK(network); 618 DCHECK(network);
614 Browser* browser = BrowserList::GetLastActive(); 619 Browser* browser = BrowserList::GetLastActive();
615 if (!browser) 620 if (!browser)
616 return; 621 return;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 chromeos::TYPE_WIFI); 690 chromeos::TYPE_WIFI);
686 browser->ShowOptionsTab(page); 691 browser->ShowOptionsTab(page);
687 } 692 }
688 } else { 693 } else {
689 const bool kFocusLogin = true; 694 const bool kFocusLogin = true;
690 ShowNetworkConfigView(new NetworkConfigView(), kFocusLogin); 695 ShowNetworkConfigView(new NetworkConfigView(), kFocusLogin);
691 } 696 }
692 } 697 }
693 698
694 } // namespace chromeos 699 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/network_menu.h ('k') | chrome/browser/chromeos/status/network_menu_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698