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

Side by Side Diff: gpu/config/gpu_control_list.cc

Issue 17034006: Add base namespace to more values in sync and elsewhere. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « google_apis/gaia/oauth2_mint_token_flow.cc ('k') | ipc/ipc_message_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "gpu/config/gpu_control_list.h" 5 #include "gpu/config/gpu_control_list.h"
6 6
7 #include "base/cpu.h" 7 #include "base/cpu.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 1171 matching lines...) Expand 10 before | Expand all | Expand 10 after
1182 if (!ProcessVersionString(browser_version_string, '.', &pieces)) 1182 if (!ProcessVersionString(browser_version_string, '.', &pieces))
1183 return false; 1183 return false;
1184 browser_version_ = browser_version_string; 1184 browser_version_ = browser_version_string;
1185 1185
1186 scoped_ptr<base::Value> root; 1186 scoped_ptr<base::Value> root;
1187 root.reset(base::JSONReader::Read(json_context)); 1187 root.reset(base::JSONReader::Read(json_context));
1188 if (root.get() == NULL || !root->IsType(base::Value::TYPE_DICTIONARY)) 1188 if (root.get() == NULL || !root->IsType(base::Value::TYPE_DICTIONARY))
1189 return false; 1189 return false;
1190 1190
1191 base::DictionaryValue* root_dictionary = 1191 base::DictionaryValue* root_dictionary =
1192 static_cast<DictionaryValue*>(root.get()); 1192 static_cast<base::DictionaryValue*>(root.get());
1193 DCHECK(root_dictionary); 1193 DCHECK(root_dictionary);
1194 return LoadList(*root_dictionary, os_filter); 1194 return LoadList(*root_dictionary, os_filter);
1195 } 1195 }
1196 1196
1197 bool GpuControlList::LoadList(const base::DictionaryValue& parsed_json, 1197 bool GpuControlList::LoadList(const base::DictionaryValue& parsed_json,
1198 GpuControlList::OsFilter os_filter) { 1198 GpuControlList::OsFilter os_filter) {
1199 std::vector<ScopedGpuControlListEntry> entries; 1199 std::vector<ScopedGpuControlListEntry> entries;
1200 1200
1201 parsed_json.GetString("version", &version_); 1201 parsed_json.GetString("version", &version_);
1202 std::vector<std::string> pieces; 1202 std::vector<std::string> pieces;
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1410 const std::string& feature_name, int feature_id) { 1410 const std::string& feature_name, int feature_id) {
1411 feature_map_[feature_name] = feature_id; 1411 feature_map_[feature_name] = feature_id;
1412 } 1412 }
1413 1413
1414 void GpuControlList::set_supports_feature_type_all(bool supported) { 1414 void GpuControlList::set_supports_feature_type_all(bool supported) {
1415 supports_feature_type_all_ = supported; 1415 supports_feature_type_all_ = supported;
1416 } 1416 }
1417 1417
1418 } // namespace gpu 1418 } // namespace gpu
1419 1419
OLDNEW
« no previous file with comments | « google_apis/gaia/oauth2_mint_token_flow.cc ('k') | ipc/ipc_message_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698