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

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

Issue 1676002: WifiConfigView - support networks with 802.1x authentication by... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 10 years, 8 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
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_button.h" 5 #include "chrome/browser/chromeos/status/network_menu_button.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 NetworkConfigView* view = new NetworkConfigView(wifi, false); 123 NetworkConfigView* view = new NetworkConfigView(wifi, false);
124 views::Window* window = views::Window::CreateChromeWindow( 124 views::Window* window = views::Window::CreateChromeWindow(
125 host_->GetNativeWindow(), gfx::Rect(), view); 125 host_->GetNativeWindow(), gfx::Rect(), view);
126 window->SetIsAlwaysOnTop(true); 126 window->SetIsAlwaysOnTop(true);
127 window->Show(); 127 window->Show();
128 } 128 }
129 } else { 129 } else {
130 // If wifi network is not encrypted, then directly connect. 130 // If wifi network is not encrypted, then directly connect.
131 // Otherwise, we open password dialog window. 131 // Otherwise, we open password dialog window.
132 if (!wifi.encrypted) { 132 if (!wifi.encrypted) {
133 cros->ConnectToWifiNetwork(wifi, string16()); 133 cros->ConnectToWifiNetwork(wifi, string16(), string16(), string16());
134 } else { 134 } else {
135 NetworkConfigView* view = new NetworkConfigView(wifi, true); 135 NetworkConfigView* view = new NetworkConfigView(wifi, true);
136 views::Window* window = views::Window::CreateChromeWindow( 136 views::Window* window = views::Window::CreateChromeWindow(
137 host_->GetNativeWindow(), gfx::Rect(), view); 137 host_->GetNativeWindow(), gfx::Rect(), view);
138 window->SetIsAlwaysOnTop(true); 138 window->SetIsAlwaysOnTop(true);
139 window->Show(); 139 window->Show();
140 view->SetLoginTextfieldFocus(); 140 view->SetLoginTextfieldFocus();
141 } 141 }
142 } 142 }
143 } else if (flags & FLAG_CELLULAR) { 143 } else if (flags & FLAG_CELLULAR) {
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 if (host_->ShouldOpenButtonOptions(this)) { 511 if (host_->ShouldOpenButtonOptions(this)) {
512 label = 512 label =
513 l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG); 513 l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG);
514 menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label, 514 menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
515 SkBitmap(), WifiNetwork(), CellularNetwork(), FLAG_OPTIONS)); 515 SkBitmap(), WifiNetwork(), CellularNetwork(), FLAG_OPTIONS));
516 } 516 }
517 } 517 }
518 } 518 }
519 519
520 } // namespace chromeos 520 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698