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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 10698095: Add dummy implementation of about_flags for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 54342ea919db15e3a9d7cefbb047261bf8c78da6..de5fc550eef68182bb17e30fd9641e7e02a6c918 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1248,14 +1248,12 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
master_prefs_.reset(new first_run::MasterPrefs);
browser_creator_.reset(new StartupBrowserCreator);
-#if !defined(OS_ANDROID)
// Convert active labs into switches. This needs to be done before
// ResourceBundle::InitSharedInstanceWithLocale as some loaded resources are
// affected by experiment flags (--touch-optimized-ui in particular). Not
// needed on Android as there aren't experimental flags.
about_flags::ConvertFlagsToSwitches(local_state_,
CommandLine::ForCurrentProcess());
-#endif
local_state_->UpdateCommandLinePrefStore(CommandLine::ForCurrentProcess());
// Reset the command line in the crash report details, since we may have
@@ -1755,9 +1753,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
HandleTestParameters(parsed_command_line());
RecordBreakpadStatusUMA(browser_process_->metrics_service());
-#if !defined(OS_ANDROID)
about_flags::RecordUMAStatistics(local_state_);
-#endif
LanguageUsageMetrics::RecordAcceptLanguages(
profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
LanguageUsageMetrics::RecordApplicationLanguage(

Powered by Google App Engine
This is Rietveld 408576698