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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Issue 1426393003: NOT FOR REVIEW Base URL: https://chromium.googlesource.com/chromium/src.git@submit-4.5-split-wcss
Patch Set: Created 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/webui/options/chromeos/internet_options_handler.h" 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
6 6
7 #include <ctype.h> 7 #include <ctype.h>
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 kGetManagedPropertiesResultFunction), 442 kGetManagedPropertiesResultFunction),
443 base::Bind(&ShillError, "GetManagedProperties")); 443 base::Bind(&ShillError, "GetManagedProperties"));
444 } 444 }
445 445
446 void InternetOptionsHandler::RequestNetworkScanCallback( 446 void InternetOptionsHandler::RequestNetworkScanCallback(
447 const base::ListValue* args) { 447 const base::ListValue* args) {
448 NetworkHandler::Get()->network_state_handler()->RequestScan(); 448 NetworkHandler::Get()->network_state_handler()->RequestScan();
449 } 449 }
450 450
451 void InternetOptionsHandler::StartConnectCallback(const base::ListValue* args) { 451 void InternetOptionsHandler::StartConnectCallback(const base::ListValue* args) {
452 LOG(ERROR) << "*** QUICHE: " << __func__;
452 std::string service_path; 453 std::string service_path;
453 if (!args->GetString(0, &service_path)) { 454 if (!args->GetString(0, &service_path)) {
454 NOTREACHED(); 455 NOTREACHED();
455 return; 456 return;
456 } 457 }
457 ui::NetworkConnect::Get()->ConnectToNetwork(service_path); 458 ui::NetworkConnect::Get()->ConnectToNetwork(service_path);
458 } 459 }
459 460
460 void InternetOptionsHandler::StartDisconnectCallback( 461 void InternetOptionsHandler::StartDisconnectCallback(
461 const base::ListValue* args) { 462 const base::ListValue* args) {
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 dictionary->SetBoolean( 740 dictionary->SetBoolean(
740 kTagWimaxAvailable, 741 kTagWimaxAvailable,
741 handler->IsTechnologyAvailable(NetworkTypePattern::Wimax())); 742 handler->IsTechnologyAvailable(NetworkTypePattern::Wimax()));
742 dictionary->SetBoolean( 743 dictionary->SetBoolean(
743 kTagWimaxEnabled, 744 kTagWimaxEnabled,
744 handler->IsTechnologyEnabled(NetworkTypePattern::Wimax())); 745 handler->IsTechnologyEnabled(NetworkTypePattern::Wimax()));
745 } 746 }
746 747
747 } // namespace options 748 } // namespace options
748 } // namespace chromeos 749 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698