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

Unified Diff: chrome/browser/chrome_browser_main.h

Issue 1997453003: Fix "unused variable" warnings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move changes in and out to fix compile Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browsing_data/origin_filter_builder.h ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.h
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index 326406eb990e615badbeada532e44c523218f8f2..4c02bd8cecd0c75944d3fbffa4ad84c902ef9e09 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -166,6 +166,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
std::unique_ptr<BrowserProcessImpl> browser_process_;
scoped_refptr<metrics::TrackingSynchronizer> tracking_synchronizer_;
+
#if !defined(OS_ANDROID)
// Browser creation happens on the Java side in Android.
std::unique_ptr<StartupBrowserCreator> browser_creator_;
@@ -176,10 +177,16 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
// Android's first run is done in Java instead of native.
std::unique_ptr<first_run::MasterPrefs> master_prefs_;
+
+ ProcessSingleton::NotifyResult notify_result_ =
+ ProcessSingleton::PROCESS_NONE;
+
+ // Members needed across shutdown methods.
+ bool restart_last_session_ = false;
#endif
+
Profile* profile_;
bool run_message_loop_;
- ProcessSingleton::NotifyResult notify_result_;
std::unique_ptr<ThreeDAPIObserver> three_d_observer_;
// Initialized in SetupMetricsAndFieldTrials.
@@ -190,9 +197,6 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
PrefService* local_state_;
base::FilePath user_data_dir_;
- // Members needed across shutdown methods.
- bool restart_last_session_;
-
DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
};
« no previous file with comments | « chrome/browser/browsing_data/origin_filter_builder.h ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698