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

Side by Side Diff: content/shell/browser/shell_browser_main_parts.cc

Issue 2211473003: Remove calls to deprecated MessageLoop methods on Windows and Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/shell/browser/shell_browser_main_parts.h" 5 #include "content/shell/browser/shell_browser_main_parts.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/message_loop/message_loop.h"
13 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
14 #include "base/threading/thread_restrictions.h" 13 #include "base/threading/thread_restrictions.h"
15 #include "build/build_config.h" 14 #include "build/build_config.h"
16 #include "components/devtools_http_handler/devtools_http_handler.h" 15 #include "components/devtools_http_handler/devtools_http_handler.h"
17 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
18 #include "content/public/browser/storage_partition.h" 17 #include "content/public/browser/storage_partition.h"
19 #include "content/public/common/content_switches.h" 18 #include "content/public/common/content_switches.h"
20 #include "content/public/common/main_function_params.h" 19 #include "content/public/common/main_function_params.h"
21 #include "content/public/common/url_constants.h" 20 #include "content/public/common/url_constants.h"
22 #include "content/shell/android/shell_descriptors.h" 21 #include "content/shell/android/shell_descriptors.h"
23 #include "content/shell/browser/shell.h" 22 #include "content/shell/browser/shell.h"
24 #include "content/shell/browser/shell_access_token_store.h" 23 #include "content/shell/browser/shell_access_token_store.h"
25 #include "content/shell/browser/shell_browser_context.h" 24 #include "content/shell/browser/shell_browser_context.h"
26 #include "content/shell/browser/shell_devtools_manager_delegate.h" 25 #include "content/shell/browser/shell_devtools_manager_delegate.h"
27 #include "content/shell/browser/shell_net_log.h" 26 #include "content/shell/browser/shell_net_log.h"
28 #include "content/shell/common/shell_switches.h" 27 #include "content/shell/common/shell_switches.h"
29 #include "device/bluetooth/bluetooth_adapter_factory.h" 28 #include "device/bluetooth/bluetooth_adapter_factory.h"
30 #include "device/geolocation/geolocation_delegate.h" 29 #include "device/geolocation/geolocation_delegate.h"
31 #include "device/geolocation/geolocation_provider.h" 30 #include "device/geolocation/geolocation_provider.h"
32 #include "net/base/filename_util.h" 31 #include "net/base/filename_util.h"
33 #include "net/base/net_module.h" 32 #include "net/base/net_module.h"
34 #include "net/grit/net_resources.h" 33 #include "net/grit/net_resources.h"
35 #include "ui/base/material_design/material_design_controller.h" 34 #include "ui/base/material_design/material_design_controller.h"
36 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
37 #include "url/gurl.h" 36 #include "url/gurl.h"
38 37
39 #if defined(OS_ANDROID) 38 #if defined(OS_ANDROID)
39 #include "base/message_loop/message_loop.h"
40 #include "components/crash/content/browser/crash_dump_manager_android.h" 40 #include "components/crash/content/browser/crash_dump_manager_android.h"
41 #include "components/crash/content/browser/crash_dump_observer_android.h" 41 #include "components/crash/content/browser/crash_dump_observer_android.h"
42 #include "net/android/network_change_notifier_factory_android.h" 42 #include "net/android/network_change_notifier_factory_android.h"
43 #include "net/base/network_change_notifier.h" 43 #include "net/base/network_change_notifier.h"
44 #endif 44 #endif
45 45
46 #if defined(USE_AURA) && defined(USE_X11) 46 #if defined(USE_AURA) && defined(USE_X11)
47 #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck 47 #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
48 #endif 48 #endif
49 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) 49 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 device::BluetoothAdapterFactory::Shutdown(); 224 device::BluetoothAdapterFactory::Shutdown();
225 bluez::BluezDBusManager::Shutdown(); 225 bluez::BluezDBusManager::Shutdown();
226 chromeos::DBusThreadManager::Shutdown(); 226 chromeos::DBusThreadManager::Shutdown();
227 #elif defined(OS_LINUX) 227 #elif defined(OS_LINUX)
228 device::BluetoothAdapterFactory::Shutdown(); 228 device::BluetoothAdapterFactory::Shutdown();
229 bluez::DBusBluezManagerWrapperLinux::Shutdown(); 229 bluez::DBusBluezManagerWrapperLinux::Shutdown();
230 #endif 230 #endif
231 } 231 }
232 232
233 } // namespace 233 } // namespace
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_video_renderer_sink_unittest.cc ('k') | dbus/end_to_end_async_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698