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

Side by Side Diff: chrome/browser/chromeos/options/internet_page_view.cc

Issue 1692005: 2nd attempt to land http://codereview.chromium.org/1676002 for njw... (Closed) Base URL: svn://chrome-svn/chrome/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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 if (static_cast<int>(wifi_networks_.size()) > id) { 356 if (static_cast<int>(wifi_networks_.size()) > id) {
357 if (button == CONNECT_BUTTON) { 357 if (button == CONNECT_BUTTON) {
358 // Connect to wifi here. Open password page if appropriate. 358 // Connect to wifi here. Open password page if appropriate.
359 if (wifi_networks_[id].encrypted) { 359 if (wifi_networks_[id].encrypted) {
360 NetworkConfigView* view = 360 NetworkConfigView* view =
361 new NetworkConfigView(wifi_networks_[id], true); 361 new NetworkConfigView(wifi_networks_[id], true);
362 CreateModalPopup(view); 362 CreateModalPopup(view);
363 view->SetLoginTextfieldFocus(); 363 view->SetLoginTextfieldFocus();
364 } else { 364 } else {
365 CrosLibrary::Get()->GetNetworkLibrary()->ConnectToWifiNetwork( 365 CrosLibrary::Get()->GetNetworkLibrary()->ConnectToWifiNetwork(
366 wifi_networks_[id], 366 wifi_networks_[id], string16(), string16(), string16());
367 string16());
368 } 367 }
369 } else if (button == DISCONNECT_BUTTON) { 368 } else if (button == DISCONNECT_BUTTON) {
370 // TODO(chocobo): Disconnect from wifi network 369 // TODO(chocobo): Disconnect from wifi network
371 NOTIMPLEMENTED(); 370 NOTIMPLEMENTED();
372 } else { 371 } else {
373 CreateModalPopup(new NetworkConfigView(wifi_networks_[id], false)); 372 CreateModalPopup(new NetworkConfigView(wifi_networks_[id], false));
374 } 373 }
375 } 374 }
376 } else { 375 } else {
377 NOTREACHED(); 376 NOTREACHED();
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); 514 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
516 515
517 layout->StartRow(0, single_column_view_set_id); 516 layout->StartRow(0, single_column_view_set_id);
518 layout->AddView(new RememberedSection(this, profile())); 517 layout->AddView(new RememberedSection(this, profile()));
519 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); 518 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
520 519
521 Layout(); 520 Layout();
522 } 521 }
523 522
524 } // namespace chromeos 523 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/network_screen_browsertest.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