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

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

Issue 1427393002: Revert of Allow Chrome to bind an Application request from mojo_runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@callback
Patch Set: Created 5 years, 1 month 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 | « chrome/browser/DEPS ('k') | chrome/browser/chrome_browser_main.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 #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"
11 #include "base/profiler/stack_sampling_profiler.h" 11 #include "base/profiler/stack_sampling_profiler.h"
12 #include "base/tracked_objects.h" 12 #include "base/tracked_objects.h"
13 #include "chrome/browser/chrome_browser_field_trials.h" 13 #include "chrome/browser/chrome_browser_field_trials.h"
14 #include "chrome/browser/chrome_process_singleton.h" 14 #include "chrome/browser/chrome_process_singleton.h"
15 #include "chrome/browser/first_run/first_run.h" 15 #include "chrome/browser/first_run/first_run.h"
16 #include "chrome/browser/process_singleton.h" 16 #include "chrome/browser/process_singleton.h"
17 #include "chrome/browser/stack_sampling_configuration.h" 17 #include "chrome/browser/stack_sampling_configuration.h"
18 #include "chrome/browser/ui/startup/startup_browser_creator.h" 18 #include "chrome/browser/ui/startup/startup_browser_creator.h"
19 #include "content/public/browser/browser_main_parts.h" 19 #include "content/public/browser/browser_main_parts.h"
20 #include "content/public/common/main_function_params.h" 20 #include "content/public/common/main_function_params.h"
21 21
22 class BrowserProcessImpl; 22 class BrowserProcessImpl;
23 class ChromeBrowserMainExtraParts; 23 class ChromeBrowserMainExtraParts;
24 class FieldTrialSynchronizer; 24 class FieldTrialSynchronizer;
25 class MetricsService; 25 class MetricsService;
26 class MojoRunnerState;
27 class PrefService; 26 class PrefService;
28 class ProcessPowerCollector; 27 class ProcessPowerCollector;
29 class Profile; 28 class Profile;
30 class StartupBrowserCreator; 29 class StartupBrowserCreator;
31 class StartupTimeBomb; 30 class StartupTimeBomb;
32 class ShutdownWatcherHelper; 31 class ShutdownWatcherHelper;
33 class ThreeDAPIObserver; 32 class ThreeDAPIObserver;
34 33
35 namespace chrome_browser { 34 namespace chrome_browser {
36 // For use by ShowMissingLocaleMessageBox. 35 // For use by ShowMissingLocaleMessageBox.
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_; 184 scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_;
186 185
187 // Members initialized in PreMainMessageLoopRun, needed in 186 // Members initialized in PreMainMessageLoopRun, needed in
188 // PreMainMessageLoopRunThreadsCreated. 187 // PreMainMessageLoopRunThreadsCreated.
189 PrefService* local_state_; 188 PrefService* local_state_;
190 base::FilePath user_data_dir_; 189 base::FilePath user_data_dir_;
191 190
192 // Members needed across shutdown methods. 191 // Members needed across shutdown methods.
193 bool restart_last_session_; 192 bool restart_last_session_;
194 193
195 #if defined(MOJO_RUNNER_CLIENT)
196 scoped_ptr<MojoRunnerState> mojo_runner_state_;
197 #endif
198
199 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts); 194 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
200 }; 195 };
201 196
202 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 197 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698