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

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

Issue 23316003: [content shell] move browser process stuff into browser/ subdir (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | Annotate | Revision Log
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 #include "content/shell/shell_browser_main_parts.h" 5 #include "content/shell/browser/shell_browser_main_parts.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/threading/thread.h" 11 #include "base/threading/thread.h"
12 #include "base/threading/thread_restrictions.h" 12 #include "base/threading/thread_restrictions.h"
13 #include "cc/base/switches.h" 13 #include "cc/base/switches.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "content/public/browser/storage_partition.h" 15 #include "content/public/browser/storage_partition.h"
16 #include "content/public/common/content_switches.h" 16 #include "content/public/common/content_switches.h"
17 #include "content/public/common/main_function_params.h" 17 #include "content/public/common/main_function_params.h"
18 #include "content/public/common/url_constants.h" 18 #include "content/public/common/url_constants.h"
19 #include "content/shell/browser/shell.h"
20 #include "content/shell/browser/shell_browser_context.h"
21 #include "content/shell/browser/shell_devtools_delegate.h"
22 #include "content/shell/browser/shell_net_log.h"
19 #include "content/shell/common/shell_switches.h" 23 #include "content/shell/common/shell_switches.h"
20 #include "content/shell/shell.h"
21 #include "content/shell/shell_browser_context.h"
22 #include "content/shell/shell_devtools_delegate.h"
23 #include "content/shell/shell_net_log.h"
24 #include "grit/net_resources.h" 24 #include "grit/net_resources.h"
25 #include "net/base/net_module.h" 25 #include "net/base/net_module.h"
26 #include "net/base/net_util.h" 26 #include "net/base/net_util.h"
27 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
28 #include "url/gurl.h" 28 #include "url/gurl.h"
29 #include "webkit/browser/quota/quota_manager.h" 29 #include "webkit/browser/quota/quota_manager.h"
30 30
31 #if defined(ENABLE_PLUGINS) 31 #if defined(ENABLE_PLUGINS)
32 #include "content/public/browser/plugin_service.h" 32 #include "content/public/browser/plugin_service.h"
33 #include "content/shell/shell_plugin_service_filter.h" 33 #include "content/shell/browser/shell_plugin_service_filter.h"
34 #endif 34 #endif
35 35
36 #if defined(OS_ANDROID) 36 #if defined(OS_ANDROID)
37 #include "net/android/network_change_notifier_factory_android.h" 37 #include "net/android/network_change_notifier_factory_android.h"
38 #include "net/base/network_change_notifier.h" 38 #include "net/base/network_change_notifier.h"
39 #endif 39 #endif
40 40
41 #if defined(USE_AURA) && defined(USE_X11) 41 #if defined(USE_AURA) && defined(USE_X11)
42 #include "ui/base/touch/touch_factory_x11.h" 42 #include "ui/base/touch/touch_factory_x11.h"
43 #endif 43 #endif
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 #if defined(USE_AURA) 166 #if defined(USE_AURA)
167 Shell::PlatformExit(); 167 Shell::PlatformExit();
168 #endif 168 #endif
169 if (devtools_delegate_) 169 if (devtools_delegate_)
170 devtools_delegate_->Stop(); 170 devtools_delegate_->Stop();
171 browser_context_.reset(); 171 browser_context_.reset();
172 off_the_record_browser_context_.reset(); 172 off_the_record_browser_context_.reset();
173 } 173 }
174 174
175 } // namespace 175 } // namespace
OLDNEW
« no previous file with comments | « content/shell/browser/shell_browser_main_parts.h ('k') | content/shell/browser/shell_browser_main_parts_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698