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

Side by Side Diff: content/shell/browser/layout_test/layout_test_browser_main_parts.cc

Issue 1351923002: Revert of Turn components/crash into a layered component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/layout_test/layout_test_browser_main_parts.h" 5 #include "content/shell/browser/layout_test/layout_test_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"
(...skipping 17 matching lines...) Expand all
28 #include "storage/browser/quota/quota_manager.h" 28 #include "storage/browser/quota/quota_manager.h"
29 #include "ui/base/resource/resource_bundle.h" 29 #include "ui/base/resource/resource_bundle.h"
30 #include "url/gurl.h" 30 #include "url/gurl.h"
31 31
32 #if defined(ENABLE_PLUGINS) 32 #if defined(ENABLE_PLUGINS)
33 #include "content/public/browser/plugin_service.h" 33 #include "content/public/browser/plugin_service.h"
34 #include "content/shell/browser/shell_plugin_service_filter.h" 34 #include "content/shell/browser/shell_plugin_service_filter.h"
35 #endif 35 #endif
36 36
37 #if defined(OS_ANDROID) 37 #if defined(OS_ANDROID)
38 #include "components/crash/content/browser/crash_dump_manager_android.h" 38 #include "components/crash/browser/crash_dump_manager_android.h"
39 #include "net/android/network_change_notifier_factory_android.h" 39 #include "net/android/network_change_notifier_factory_android.h"
40 #include "net/base/network_change_notifier.h" 40 #include "net/base/network_change_notifier.h"
41 #endif 41 #endif
42 42
43 #if defined(USE_AURA) && defined(USE_X11) 43 #if defined(USE_AURA) && defined(USE_X11)
44 #include "ui/events/devices/x11/touch_factory_x11.h" 44 #include "ui/events/devices/x11/touch_factory_x11.h"
45 #endif 45 #endif
46 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) 46 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
47 #include "ui/base/ime/input_method_initializer.h" 47 #include "ui/base/ime/input_method_initializer.h"
48 #endif 48 #endif
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 storage::QuotaCallback())); 83 storage::QuotaCallback()));
84 84
85 #if defined(ENABLE_PLUGINS) 85 #if defined(ENABLE_PLUGINS)
86 PluginService* plugin_service = PluginService::GetInstance(); 86 PluginService* plugin_service = PluginService::GetInstance();
87 plugin_service_filter_.reset(new ShellPluginServiceFilter); 87 plugin_service_filter_.reset(new ShellPluginServiceFilter);
88 plugin_service->SetFilter(plugin_service_filter_.get()); 88 plugin_service->SetFilter(plugin_service_filter_.get());
89 #endif 89 #endif
90 } 90 }
91 91
92 } // namespace 92 } // namespace
OLDNEW
« no previous file with comments | « content/shell/app/shell_main_delegate.cc ('k') | content/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698