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

Side by Side Diff: content/shell/browser/shell_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/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"
(...skipping 13 matching lines...) Expand all
24 #include "content/shell/browser/shell_devtools_manager_delegate.h" 24 #include "content/shell/browser/shell_devtools_manager_delegate.h"
25 #include "content/shell/browser/shell_net_log.h" 25 #include "content/shell/browser/shell_net_log.h"
26 #include "content/shell/common/shell_switches.h" 26 #include "content/shell/common/shell_switches.h"
27 #include "net/base/filename_util.h" 27 #include "net/base/filename_util.h"
28 #include "net/base/net_module.h" 28 #include "net/base/net_module.h"
29 #include "net/grit/net_resources.h" 29 #include "net/grit/net_resources.h"
30 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
31 #include "url/gurl.h" 31 #include "url/gurl.h"
32 32
33 #if defined(OS_ANDROID) 33 #if defined(OS_ANDROID)
34 #include "components/crash/content/browser/crash_dump_manager_android.h" 34 #include "components/crash/browser/crash_dump_manager_android.h"
35 #include "net/android/network_change_notifier_factory_android.h" 35 #include "net/android/network_change_notifier_factory_android.h"
36 #include "net/base/network_change_notifier.h" 36 #include "net/base/network_change_notifier.h"
37 #endif 37 #endif
38 38
39 #if defined(USE_AURA) && defined(USE_X11) 39 #if defined(USE_AURA) && defined(USE_X11)
40 #include "ui/events/devices/x11/touch_factory_x11.h" 40 #include "ui/events/devices/x11/touch_factory_x11.h"
41 #endif 41 #endif
42 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) 42 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
43 #include "ui/base/ime/input_method_initializer.h" 43 #include "ui/base/ime/input_method_initializer.h"
44 #endif 44 #endif
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 return !run_message_loop_; 161 return !run_message_loop_;
162 } 162 }
163 163
164 void ShellBrowserMainParts::PostMainMessageLoopRun() { 164 void ShellBrowserMainParts::PostMainMessageLoopRun() {
165 devtools_http_handler_.reset(); 165 devtools_http_handler_.reset();
166 browser_context_.reset(); 166 browser_context_.reset();
167 off_the_record_browser_context_.reset(); 167 off_the_record_browser_context_.reset();
168 } 168 }
169 169
170 } // namespace 170 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698