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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 188443003: Parsing /proc/cpuinfo for model on Android and Aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit. Created 6 years, 7 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
« no previous file with comments | « base/cpu.cc ('k') | content/shell/app/shell_main_delegate.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) 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/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/cpu.h"
8 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
9 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
10 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
11 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
12 #include "base/metrics/statistics_recorder.h" 13 #include "base/metrics/statistics_recorder.h"
13 #include "base/metrics/stats_counters.h" 14 #include "base/metrics/stats_counters.h"
14 #include "base/path_service.h" 15 #include "base/path_service.h"
15 #include "base/process/memory.h" 16 #include "base/process/memory.h"
16 #include "base/process/process_handle.h" 17 #include "base/process/process_handle.h"
17 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 PathService::Override(content::CHILD_PROCESS_EXE, 641 PathService::Override(content::CHILD_PROCESS_EXE,
641 chrome::GetVersionedDirectory(). 642 chrome::GetVersionedDirectory().
642 Append(chrome::kHelperProcessExecutablePath)); 643 Append(chrome::kHelperProcessExecutablePath));
643 644
644 InitMacCrashReporter(command_line, process_type); 645 InitMacCrashReporter(command_line, process_type);
645 #endif 646 #endif
646 647
647 #if defined(OS_WIN) 648 #if defined(OS_WIN)
648 child_process_logging::Init(); 649 child_process_logging::Init();
649 #endif 650 #endif
651 #if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
652 // Create an instance of the CPU class to parse /proc/cpuinfo and cache
653 // cpu_brand info.
654 base::CPU cpu_info;
655 #endif
650 656
651 // Initialize the user data dir for any process type that needs it. 657 // Initialize the user data dir for any process type that needs it.
652 if (chrome::ProcessNeedsProfileDir(process_type)) 658 if (chrome::ProcessNeedsProfileDir(process_type))
653 InitializeUserDataDir(); 659 InitializeUserDataDir();
654 660
655 stats_counter_timer_.reset(new base::StatsCounterTimer("Chrome.Init")); 661 stats_counter_timer_.reset(new base::StatsCounterTimer("Chrome.Init"));
656 startup_timer_.reset(new base::StatsScope<base::StatsCounterTimer> 662 startup_timer_.reset(new base::StatsScope<base::StatsCounterTimer>
657 (*stats_counter_timer_)); 663 (*stats_counter_timer_));
658 664
659 // Enable the heap profiler as early as possible! 665 // Enable the heap profiler as early as possible!
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 } 902 }
897 903
898 content::ContentUtilityClient* 904 content::ContentUtilityClient*
899 ChromeMainDelegate::CreateContentUtilityClient() { 905 ChromeMainDelegate::CreateContentUtilityClient() {
900 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 906 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
901 return NULL; 907 return NULL;
902 #else 908 #else
903 return g_chrome_content_utility_client.Pointer(); 909 return g_chrome_content_utility_client.Pointer();
904 #endif 910 #endif
905 } 911 }
OLDNEW
« no previous file with comments | « base/cpu.cc ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698