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

Side by Side Diff: chrome/browser/chrome_browser_main.h

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
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 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 5 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
6 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 6 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 #endif 140 #endif
141 141
142 // Vector of additional ChromeBrowserMainExtraParts. 142 // Vector of additional ChromeBrowserMainExtraParts.
143 // Parts are deleted in the inverse order they are added. 143 // Parts are deleted in the inverse order they are added.
144 std::vector<ChromeBrowserMainExtraParts*> chrome_extra_parts_; 144 std::vector<ChromeBrowserMainExtraParts*> chrome_extra_parts_;
145 145
146 // Members initialized after / released before main_message_loop_ ------------ 146 // Members initialized after / released before main_message_loop_ ------------
147 147
148 scoped_ptr<BrowserProcessImpl> browser_process_; 148 scoped_ptr<BrowserProcessImpl> browser_process_;
149 scoped_refptr<metrics::TrackingSynchronizer> tracking_synchronizer_; 149 scoped_refptr<metrics::TrackingSynchronizer> tracking_synchronizer_;
150 #if !defined(OS_ANDROID) 150 #if !defined(OS_ANDROID) || defined(USE_AURA)
151 // Browser creation happens on the Java side in Android. 151 // Browser creation happens on the Java side in Android.
152 scoped_ptr<StartupBrowserCreator> browser_creator_; 152 scoped_ptr<StartupBrowserCreator> browser_creator_;
153 153
154 // Android doesn't support multiple browser processes, so it doesn't implement 154 // Android doesn't support multiple browser processes, so it doesn't implement
155 // ProcessSingleton. 155 // ProcessSingleton.
156 scoped_ptr<ChromeProcessSingleton> process_singleton_; 156 scoped_ptr<ChromeProcessSingleton> process_singleton_;
157 157
158 // Android's first run is done in Java instead of native. 158 // Android's first run is done in Java instead of native.
159 scoped_ptr<first_run::MasterPrefs> master_prefs_; 159 scoped_ptr<first_run::MasterPrefs> master_prefs_;
160 #endif 160 #endif // !defined(OS_ANDROID) || defined(USE_AURA)
161 Profile* profile_; 161 Profile* profile_;
162 bool run_message_loop_; 162 bool run_message_loop_;
163 ProcessSingleton::NotifyResult notify_result_; 163 ProcessSingleton::NotifyResult notify_result_;
164 scoped_ptr<ThreeDAPIObserver> three_d_observer_; 164 scoped_ptr<ThreeDAPIObserver> three_d_observer_;
165 165
166 // Initialized in SetupMetricsAndFieldTrials. 166 // Initialized in SetupMetricsAndFieldTrials.
167 scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_; 167 scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_;
168 168
169 // Members initialized in PreMainMessageLoopRun, needed in 169 // Members initialized in PreMainMessageLoopRun, needed in
170 // PreMainMessageLoopRunThreadsCreated. 170 // PreMainMessageLoopRunThreadsCreated.
171 PrefService* local_state_; 171 PrefService* local_state_;
172 base::FilePath user_data_dir_; 172 base::FilePath user_data_dir_;
173 173
174 // Members needed across shutdown methods. 174 // Members needed across shutdown methods.
175 bool restart_last_session_; 175 bool restart_last_session_;
176 176
177 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts); 177 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
178 }; 178 };
179 179
180 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 180 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698