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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/shell/app/shell_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: Fixing review comments. Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« base/cpu.cc ('K') | « base/cpu.cc ('k') | content/zygote/zygote_main_linux.cc » ('j') | content/zygote/zygote_main_linux.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index ad2b4b8d32c3e9bffa8957192fd5dc79d836084a..88c7a6d45e5261119cbb8981cde01311749dcfc3 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -6,6 +6,7 @@
#include "base/base_switches.h"
#include "base/command_line.h"
+#include "base/cpu.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/lazy_instance.h"
@@ -185,6 +186,13 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
}
void ShellMainDelegate::PreSandboxStartup() {
+#if defined(ARCH_CPU_ARM_FAMILY)
+#if defined(OS_ANDROID) || defined(USE_AURA)
Mark Mentovai 2014/03/11 16:17:48 Pull this whole thing into a single #ifdef: #if d
rptr 2014/03/12 15:26:25 Done.
+ // Create an instance CPU class to parse /proc/cpuinfo and cache cpu_brand
Mark Mentovai 2014/03/11 16:17:48 “instance of the CPU class”
rptr 2014/03/12 15:26:25 Done.
+ // info.
+ base::CPU cpu_info;
+#endif
+#endif
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableCrashReporter)) {
std::string process_type =
« base/cpu.cc ('K') | « base/cpu.cc ('k') | content/zygote/zygote_main_linux.cc » ('j') | content/zygote/zygote_main_linux.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698