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

Side by Side Diff: chrome/browser/chromeos/options/internet_page_view.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
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/options/internet_page_view.h" 5 #include "chrome/browser/chromeos/options/internet_page_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/combobox_model.h" 9 #include "app/combobox_model.h"
10 #include "chrome/browser/chromeos/cros/cros_library.h" 10 #include "chrome/browser/chromeos/cros/cros_library.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 NetworkConfigView* view = 158 NetworkConfigView* view =
159 new NetworkConfigView(activated_wifi_network_, true); 159 new NetworkConfigView(activated_wifi_network_, true);
160 views::Window* window = views::Window::CreateChromeWindow( 160 views::Window* window = views::Window::CreateChromeWindow(
161 NULL, gfx::Rect(), view); 161 NULL, gfx::Rect(), view);
162 window->SetIsAlwaysOnTop(true); 162 window->SetIsAlwaysOnTop(true);
163 window->Show(); 163 window->Show();
164 view->SetLoginTextfieldFocus(); 164 view->SetLoginTextfieldFocus();
165 } else { 165 } else {
166 CrosLibrary::Get()->GetNetworkLibrary()->ConnectToWifiNetwork( 166 CrosLibrary::Get()->GetNetworkLibrary()->ConnectToWifiNetwork(
167 activated_wifi_network_, 167 activated_wifi_network_,
168 string16()); 168 string16(), string16(), string16());
169 } 169 }
170 } 170 }
171 171
172 void NetworkSection::ButtonPressed(views::Button* sender, 172 void NetworkSection::ButtonPressed(views::Button* sender,
173 const views::Event& event) { 173 const views::Event& event) {
174 if (sender == ethernet_options_button_) { 174 if (sender == ethernet_options_button_) {
175 NetworkConfigView* view = 175 NetworkConfigView* view =
176 new NetworkConfigView( 176 new NetworkConfigView(
177 CrosLibrary::Get()->GetNetworkLibrary()->ethernet_network()); 177 CrosLibrary::Get()->GetNetworkLibrary()->ethernet_network());
178 views::Window* window = views::Window::CreateChromeWindow( 178 views::Window* window = views::Window::CreateChromeWindow(
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id); 389 ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
390 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, 390 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
391 GridLayout::USE_PREF, 0, 0); 391 GridLayout::USE_PREF, 0, 0);
392 392
393 layout->StartRow(0, single_column_view_set_id); 393 layout->StartRow(0, single_column_view_set_id);
394 layout->AddView(new NetworkSection(profile())); 394 layout->AddView(new NetworkSection(profile()));
395 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); 395 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
396 } 396 }
397 397
398 } // namespace chromeos 398 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/network_screen.cc ('k') | chrome/browser/chromeos/options/network_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698