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

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

Issue 18868005: content: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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
« no previous file with comments | « content/shell/shell_application_mac.mm ('k') | content/shell/shell_content_browser_client.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 #include "content/shell/shell_browser_main_parts.h" 5 #include "content/shell/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.h" 10 #include "base/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/common/content_switches.h" 14 #include "content/public/common/content_switches.h"
15 #include "content/public/common/main_function_params.h" 15 #include "content/public/common/main_function_params.h"
16 #include "content/public/common/url_constants.h" 16 #include "content/public/common/url_constants.h"
17 #include "content/shell/common/shell_switches.h" 17 #include "content/shell/common/shell_switches.h"
18 #include "content/shell/shell.h" 18 #include "content/shell/shell.h"
19 #include "content/shell/shell_browser_context.h" 19 #include "content/shell/shell_browser_context.h"
20 #include "content/shell/shell_devtools_delegate.h" 20 #include "content/shell/shell_devtools_delegate.h"
21 #include "content/shell/shell_net_log.h" 21 #include "content/shell/shell_net_log.h"
22 #include "googleurl/src/gurl.h"
23 #include "grit/net_resources.h" 22 #include "grit/net_resources.h"
24 #include "net/base/net_module.h" 23 #include "net/base/net_module.h"
25 #include "net/base/net_util.h" 24 #include "net/base/net_util.h"
26 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
26 #include "url/gurl.h"
27 27
28 #if defined(ENABLE_PLUGINS) 28 #if defined(ENABLE_PLUGINS)
29 #include "content/public/browser/plugin_service.h" 29 #include "content/public/browser/plugin_service.h"
30 #include "content/shell/shell_plugin_service_filter.h" 30 #include "content/shell/shell_plugin_service_filter.h"
31 #endif 31 #endif
32 32
33 #if defined(OS_ANDROID) 33 #if defined(OS_ANDROID)
34 #include "net/android/network_change_notifier_factory_android.h" 34 #include "net/android/network_change_notifier_factory_android.h"
35 #include "net/base/network_change_notifier.h" 35 #include "net/base/network_change_notifier.h"
36 #endif 36 #endif
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 #if defined(USE_AURA) 149 #if defined(USE_AURA)
150 Shell::PlatformExit(); 150 Shell::PlatformExit();
151 #endif 151 #endif
152 if (devtools_delegate_) 152 if (devtools_delegate_)
153 devtools_delegate_->Stop(); 153 devtools_delegate_->Stop();
154 browser_context_.reset(); 154 browser_context_.reset();
155 off_the_record_browser_context_.reset(); 155 off_the_record_browser_context_.reset();
156 } 156 }
157 157
158 } // namespace 158 } // namespace
OLDNEW
« no previous file with comments | « content/shell/shell_application_mac.mm ('k') | content/shell/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698