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

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

Issue 1960743002: Remove dependency of AsyncResourceLoader on content/browser/host_zoom_map_impl.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@devtoolsnetlog-loader
Patch Set: missed override 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 unified diff | Download patch
« no previous file with comments | « no previous file | 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 <memory> 8 #include <memory>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #if defined(USE_OZONE) 61 #if defined(USE_OZONE)
62 namespace ui { 62 namespace ui {
63 class ClientNativePixmapFactory; 63 class ClientNativePixmapFactory;
64 } // namespace ui 64 } // namespace ui
65 #endif 65 #endif
66 66
67 namespace content { 67 namespace content {
68 class BrowserMainParts; 68 class BrowserMainParts;
69 class BrowserOnlineStateObserver; 69 class BrowserOnlineStateObserver;
70 class BrowserThreadImpl; 70 class BrowserThreadImpl;
71 class ContentResourceDispatcherHost;
71 class MediaStreamManager; 72 class MediaStreamManager;
72 class MojoShellContext; 73 class MojoShellContext;
73 class ResourceDispatcherHostImpl; 74 class ResourceDispatcherHostImpl;
74 class SpeechRecognitionManagerImpl; 75 class SpeechRecognitionManagerImpl;
75 class StartupTaskRunner; 76 class StartupTaskRunner;
76 class TimeZoneMonitor; 77 class TimeZoneMonitor;
77 struct MainFunctionParams; 78 struct MainFunctionParams;
78 79
79 #if defined(OS_ANDROID) 80 #if defined(OS_ANDROID)
80 class ScreenOrientationDelegate; 81 class ScreenOrientationDelegate;
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 #elif defined(OS_LINUX) && defined(USE_UDEV) 273 #elif defined(OS_LINUX) && defined(USE_UDEV)
273 std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_; 274 std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_;
274 #elif defined(OS_MACOSX) && !defined(OS_IOS) 275 #elif defined(OS_MACOSX) && !defined(OS_IOS)
275 std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_; 276 std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_;
276 #endif 277 #endif
277 #if defined(USE_OZONE) 278 #if defined(USE_OZONE)
278 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; 279 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
279 #endif 280 #endif
280 281
281 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; 282 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
283 std::unique_ptr<ContentResourceDispatcherHost>
284 content_resource_dispatcher_host_;
282 std::unique_ptr<MediaStreamManager> media_stream_manager_; 285 std::unique_ptr<MediaStreamManager> media_stream_manager_;
283 std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_; 286 std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;
284 std::unique_ptr<TimeZoneMonitor> time_zone_monitor_; 287 std::unique_ptr<TimeZoneMonitor> time_zone_monitor_;
285 288
286 // DO NOT add members here. Add them to the right categories above. 289 // DO NOT add members here. Add them to the right categories above.
287 290
288 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 291 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
289 }; 292 };
290 293
291 } // namespace content 294 } // namespace content
292 295
293 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 296 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698