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

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: CR 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/browser/shell.h" 21 #include "content/shell/browser/shell.h"
23 #include "content/shell/browser/shell_access_token_store.h" 22 #include "content/shell/browser/shell_access_token_store.h"
24 #include "content/shell/browser/shell_browser_context.h" 23 #include "content/shell/browser/shell_browser_context.h"
25 #include "content/shell/browser/shell_devtools_manager_delegate.h" 24 #include "content/shell/browser/shell_devtools_manager_delegate.h"
26 #include "content/shell/browser/shell_net_log.h" 25 #include "content/shell/browser/shell_net_log.h"
27 #include "content/shell/common/shell_switches.h" 26 #include "content/shell/common/shell_switches.h"
28 #include "device/bluetooth/bluetooth_adapter_factory.h" 27 #include "device/bluetooth/bluetooth_adapter_factory.h"
29 #include "device/geolocation/geolocation_delegate.h" 28 #include "device/geolocation/geolocation_delegate.h"
30 #include "device/geolocation/geolocation_provider.h" 29 #include "device/geolocation/geolocation_provider.h"
31 #include "net/base/filename_util.h" 30 #include "net/base/filename_util.h"
32 #include "net/base/net_module.h" 31 #include "net/base/net_module.h"
33 #include "net/grit/net_resources.h" 32 #include "net/grit/net_resources.h"
34 #include "ui/base/material_design/material_design_controller.h" 33 #include "ui/base/material_design/material_design_controller.h"
35 #include "ui/base/resource/resource_bundle.h" 34 #include "ui/base/resource/resource_bundle.h"
36 #include "url/gurl.h" 35 #include "url/gurl.h"
37 36
38 #if defined(OS_ANDROID) 37 #if defined(OS_ANDROID)
38 #include "base/message_loop/message_loop.h"
39 #include "components/crash/content/browser/crash_dump_manager_android.h" 39 #include "components/crash/content/browser/crash_dump_manager_android.h"
40 #include "net/android/network_change_notifier_factory_android.h" 40 #include "net/android/network_change_notifier_factory_android.h"
41 #include "net/base/network_change_notifier.h" 41 #include "net/base/network_change_notifier.h"
42 #endif 42 #endif
43 43
44 #if defined(USE_AURA) && defined(USE_X11) 44 #if defined(USE_AURA) && defined(USE_X11)
45 #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck 45 #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
46 #endif 46 #endif
47 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) 47 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
48 #include "ui/base/ime/input_method_initializer.h" 48 #include "ui/base/ime/input_method_initializer.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 device::BluetoothAdapterFactory::Shutdown(); 215 device::BluetoothAdapterFactory::Shutdown();
216 bluez::BluezDBusManager::Shutdown(); 216 bluez::BluezDBusManager::Shutdown();
217 chromeos::DBusThreadManager::Shutdown(); 217 chromeos::DBusThreadManager::Shutdown();
218 #elif defined(OS_LINUX) 218 #elif defined(OS_LINUX)
219 device::BluetoothAdapterFactory::Shutdown(); 219 device::BluetoothAdapterFactory::Shutdown();
220 bluez::DBusBluezManagerWrapperLinux::Shutdown(); 220 bluez::DBusBluezManagerWrapperLinux::Shutdown();
221 #endif 221 #endif
222 } 222 }
223 223
224 } // namespace 224 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698