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

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

Issue 11415226: webui/options: Do not use Value::CreateStringValue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 8 years 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) 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 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 dictionary->SetString(kTagProvider_type, vpn->GetProviderTypeString()); 513 dictionary->SetString(kTagProvider_type, vpn->GetProviderTypeString());
514 dictionary->SetString(kTagUsername, vpn->username()); 514 dictionary->SetString(kTagUsername, vpn->username());
515 515
516 chromeos::NetworkPropertyUIData hostname_ui_data; 516 chromeos::NetworkPropertyUIData hostname_ui_data;
517 hostname_ui_data.ParseOncProperty( 517 hostname_ui_data.ParseOncProperty(
518 vpn->ui_data(), &onc, 518 vpn->ui_data(), &onc,
519 base::StringPrintf("%s.%s", 519 base::StringPrintf("%s.%s",
520 chromeos::onc::kVPN, 520 chromeos::onc::kVPN,
521 chromeos::onc::vpn::kHost)); 521 chromeos::onc::vpn::kHost));
522 SetValueDictionary(dictionary, kTagServerHostname, 522 SetValueDictionary(dictionary, kTagServerHostname,
523 Value::CreateStringValue(vpn->server_hostname()), 523 new base::StringValue(vpn->server_hostname()),
524 hostname_ui_data); 524 hostname_ui_data);
525 } 525 }
526 526
527 // Given a list of supported carrier's by the device, return the index of 527 // Given a list of supported carrier's by the device, return the index of
528 // the carrier the device is currently using. 528 // the carrier the device is currently using.
529 int FindCurrentCarrierIndex(const base::ListValue* carriers, 529 int FindCurrentCarrierIndex(const base::ListValue* carriers,
530 const chromeos::NetworkDevice* device) { 530 const chromeos::NetworkDevice* device) {
531 DCHECK(carriers); 531 DCHECK(carriers);
532 DCHECK(device); 532 DCHECK(device);
533 533
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1764 1764
1765 dictionary->SetBoolean(kTagWimaxEnabled, cros_->wimax_enabled()); 1765 dictionary->SetBoolean(kTagWimaxEnabled, cros_->wimax_enabled());
1766 dictionary->SetBoolean(kTagWimaxAvailable, cros_->wimax_available()); 1766 dictionary->SetBoolean(kTagWimaxAvailable, cros_->wimax_available());
1767 dictionary->SetBoolean(kTagWimaxBusy, cros_->wimax_busy()); 1767 dictionary->SetBoolean(kTagWimaxBusy, cros_->wimax_busy());
1768 // TODO(kevers): The use of 'offline_mode' is not quite correct. Update once 1768 // TODO(kevers): The use of 'offline_mode' is not quite correct. Update once
1769 // we have proper back-end support. 1769 // we have proper back-end support.
1770 dictionary->SetBoolean(kTagAirplaneMode, cros_->offline_mode()); 1770 dictionary->SetBoolean(kTagAirplaneMode, cros_->offline_mode());
1771 } 1771 }
1772 1772
1773 } // namespace options 1773 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698