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

Side by Side Diff: content/browser/browser_main_loop.h

Issue 1293013002: aura: Require explicit ownership of the Env instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 4 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
« no previous file with comments | « chromecast/browser/cast_browser_main_parts.cc ('k') | content/browser/browser_main_loop.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 CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 5 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/timer/timer.h" 12 #include "base/timer/timer.h"
13 #include "content/browser/browser_process_sub_thread.h" 13 #include "content/browser/browser_process_sub_thread.h"
14 #include "content/public/browser/browser_main_runner.h" 14 #include "content/public/browser/browser_main_runner.h"
15 15
16 #if defined(USE_AURA)
17 namespace aura {
18 class Env;
19 }
20 #endif
21
16 namespace base { 22 namespace base {
17 class CommandLine; 23 class CommandLine;
18 class FilePath; 24 class FilePath;
19 class HighResolutionTimerManager; 25 class HighResolutionTimerManager;
20 class MessageLoop; 26 class MessageLoop;
21 class PowerMonitor; 27 class PowerMonitor;
22 class SystemMonitor; 28 class SystemMonitor;
23 class MemoryPressureMonitor; 29 class MemoryPressureMonitor;
24 namespace trace_event { 30 namespace trace_event {
25 class TraceMemoryController; 31 class TraceMemoryController;
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 scoped_ptr<base::PowerMonitor> power_monitor_; 193 scoped_ptr<base::PowerMonitor> power_monitor_;
188 scoped_ptr<base::HighResolutionTimerManager> hi_res_timer_manager_; 194 scoped_ptr<base::HighResolutionTimerManager> hi_res_timer_manager_;
189 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; 195 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
190 196
191 // Per-process listener for online state changes. 197 // Per-process listener for online state changes.
192 scoped_ptr<BrowserOnlineStateObserver> online_state_observer_; 198 scoped_ptr<BrowserOnlineStateObserver> online_state_observer_;
193 199
194 scoped_ptr<base::trace_event::TraceEventSystemStatsMonitor> 200 scoped_ptr<base::trace_event::TraceEventSystemStatsMonitor>
195 system_stats_monitor_; 201 system_stats_monitor_;
196 202
203 #if defined(USE_AURA)
204 scoped_ptr<aura::Env> env_;
205 #endif
206
197 #if defined(OS_WIN) 207 #if defined(OS_WIN)
198 scoped_ptr<SystemMessageWindowWin> system_message_window_; 208 scoped_ptr<SystemMessageWindowWin> system_message_window_;
199 #endif 209 #endif
200 210
201 #if defined(OS_ANDROID) 211 #if defined(OS_ANDROID)
202 // Android implementation of ScreenOrientationDelegate 212 // Android implementation of ScreenOrientationDelegate
203 scoped_ptr<ScreenOrientationDelegate> screen_orientation_delegate_; 213 scoped_ptr<ScreenOrientationDelegate> screen_orientation_delegate_;
204 #endif 214 #endif
205 215
206 scoped_ptr<MemoryObserver> memory_observer_; 216 scoped_ptr<MemoryObserver> memory_observer_;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 scoped_ptr<TimeZoneMonitor> time_zone_monitor_; 271 scoped_ptr<TimeZoneMonitor> time_zone_monitor_;
262 272
263 // DO NOT add members here. Add them to the right categories above. 273 // DO NOT add members here. Add them to the right categories above.
264 274
265 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 275 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
266 }; 276 };
267 277
268 } // namespace content 278 } // namespace content
269 279
270 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 280 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « chromecast/browser/cast_browser_main_parts.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698