OLD | NEW |
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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
425 // gpu feature flags. | 425 // gpu feature flags. |
426 void InitializeGpuDataManager(const CommandLine& parsed_command_line) { | 426 void InitializeGpuDataManager(const CommandLine& parsed_command_line) { |
427 content::GpuDataManager::GetInstance(); | 427 content::GpuDataManager::GetInstance(); |
428 if (parsed_command_line.HasSwitch(switches::kSkipGpuDataLoading) || | 428 if (parsed_command_line.HasSwitch(switches::kSkipGpuDataLoading) || |
429 parsed_command_line.HasSwitch(switches::kIgnoreGpuBlacklist)) { | 429 parsed_command_line.HasSwitch(switches::kIgnoreGpuBlacklist)) { |
430 return; | 430 return; |
431 } | 431 } |
432 | 432 |
433 const base::StringPiece gpu_blacklist_json( | 433 const base::StringPiece gpu_blacklist_json( |
434 ResourceBundle::GetSharedInstance().GetRawDataResource( | 434 ResourceBundle::GetSharedInstance().GetRawDataResource( |
435 IDR_GPU_BLACKLIST)); | 435 IDR_GPU_BLACKLIST, ui::ResourceHandle::kScaleFactorNone)); |
436 GpuBlacklist* gpu_blacklist = GpuBlacklist::GetInstance(); | 436 GpuBlacklist* gpu_blacklist = GpuBlacklist::GetInstance(); |
437 bool succeed = gpu_blacklist->LoadGpuBlacklist( | 437 bool succeed = gpu_blacklist->LoadGpuBlacklist( |
438 gpu_blacklist_json.as_string(), GpuBlacklist::kCurrentOsOnly); | 438 gpu_blacklist_json.as_string(), GpuBlacklist::kCurrentOsOnly); |
439 DCHECK(succeed); | 439 DCHECK(succeed); |
440 gpu_blacklist->UpdateGpuDataManager(); | 440 gpu_blacklist->UpdateGpuDataManager(); |
441 } | 441 } |
442 | 442 |
443 #if defined(OS_MACOSX) | 443 #if defined(OS_MACOSX) |
444 OSStatus KeychainCallback(SecKeychainEvent keychain_event, | 444 OSStatus KeychainCallback(SecKeychainEvent keychain_event, |
445 SecKeychainCallbackInfo* info, void* context) { | 445 SecKeychainCallbackInfo* info, void* context) { |
(...skipping 1561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2007 if (base::win::GetVersion() <= base::win::VERSION_XP) | 2007 if (base::win::GetVersion() <= base::win::VERSION_XP) |
2008 uma_name += "_XP"; | 2008 uma_name += "_XP"; |
2009 | 2009 |
2010 uma_name += "_PreRead_"; | 2010 uma_name += "_PreRead_"; |
2011 uma_name += pre_read_percentage; | 2011 uma_name += pre_read_percentage; |
2012 AddPreReadHistogramTime(uma_name.c_str(), time); | 2012 AddPreReadHistogramTime(uma_name.c_str(), time); |
2013 } | 2013 } |
2014 #endif | 2014 #endif |
2015 #endif | 2015 #endif |
2016 } | 2016 } |
OLD | NEW |