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

Side by Side Diff: chrome/browser/extensions/extension_info_private_api_chromeos.cc

Issue 7649006: more changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix another typo Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/extensions/extension_info_private_api_chromeos.h" 5 #include "chrome/browser/extensions/extension_info_private_api_chromeos.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/chromeos/cros/cros_library.h" 8 #include "chrome/browser/chromeos/cros/cros_library.h"
9 #include "chrome/browser/chromeos/cros/network_library.h" 9 #include "chrome/browser/chromeos/cros/network_library.h"
10 #include "chrome/browser/chromeos/login/wizard_controller.h" 10 #include "chrome/browser/chromeos/login/wizard_controller.h"
(...skipping 26 matching lines...) Expand all
37 37
38 bool GetChromeosInfoFunction::RunImpl() { 38 bool GetChromeosInfoFunction::RunImpl() {
39 ListValue* list = NULL; 39 ListValue* list = NULL;
40 EXTENSION_FUNCTION_VALIDATE(args_->GetList(0, &list)); 40 EXTENSION_FUNCTION_VALIDATE(args_->GetList(0, &list));
41 scoped_ptr<DictionaryValue> result(new DictionaryValue()); 41 scoped_ptr<DictionaryValue> result(new DictionaryValue());
42 for (size_t i = 0; i < list->GetSize(); ++i) { 42 for (size_t i = 0; i < list->GetSize(); ++i) {
43 std::string property_name; 43 std::string property_name;
44 EXTENSION_FUNCTION_VALIDATE(list->GetString(i, &property_name)); 44 EXTENSION_FUNCTION_VALIDATE(list->GetString(i, &property_name));
45 std::string value; 45 std::string value;
46 if (GetValue(property_name, &value)) 46 if (GetValue(property_name, &value))
47 result->Set(property_name, Value::CreateStringValue(value)); 47 result->Set(property_name, base::StringValue::New(value));
48 } 48 }
49 result_.reset(result.release()); 49 result_.reset(result.release());
50 SendResponse(true); 50 SendResponse(true);
51 return true; 51 return true;
52 } 52 }
53 53
54 bool GetChromeosInfoFunction::GetValue(const std::string& property_name, 54 bool GetChromeosInfoFunction::GetValue(const std::string& property_name,
55 std::string* value) { 55 std::string* value) {
56 value->clear(); 56 value->clear();
57 if (property_name == kPropertyHWID) { 57 if (property_name == kPropertyHWID) {
58 chromeos::system::StatisticsProvider* provider = 58 chromeos::system::StatisticsProvider* provider =
59 chromeos::system::StatisticsProvider::GetInstance(); 59 chromeos::system::StatisticsProvider::GetInstance();
60 provider->GetMachineStatistic(kHardwareClass, value); 60 provider->GetMachineStatistic(kHardwareClass, value);
61 } else if (property_name == kPropertyHomeProvider) { 61 } else if (property_name == kPropertyHomeProvider) {
62 if (CrosLibrary::Get()->EnsureLoaded()) { 62 if (CrosLibrary::Get()->EnsureLoaded()) {
63 NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary(); 63 NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
64 (*value) = netlib->GetCellularHomeCarrierId(); 64 (*value) = netlib->GetCellularHomeCarrierId();
65 } else { 65 } else {
66 LOG(ERROR) << "CrosLibrary can't be loaded."; 66 LOG(ERROR) << "CrosLibrary can't be loaded.";
67 } 67 }
68 } else if (property_name == kPropertyInitialLocale) { 68 } else if (property_name == kPropertyInitialLocale) {
69 *value = chromeos::WizardController::GetInitialLocale(); 69 *value = chromeos::WizardController::GetInitialLocale();
70 } else { 70 } else {
71 LOG(ERROR) << "Unknown property request: " << property_name; 71 LOG(ERROR) << "Unknown property request: " << property_name;
72 return false; 72 return false;
73 } 73 }
74 return true; 74 return true;
75 } 75 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_idle_api.cc ('k') | chrome/browser/extensions/extension_input_ime_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698