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

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

Issue 1315303004: Turn components/crash into a layered component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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_content_browser_client.h" 5 #include "content/shell/browser/shell_content_browser_client.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file.h" 9 #include "base/files/file.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 22 matching lines...) Expand all
33 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" 33 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h"
34 #include "content/shell/browser/shell_web_contents_view_delegate_creator.h" 34 #include "content/shell/browser/shell_web_contents_view_delegate_creator.h"
35 #include "content/shell/common/shell_messages.h" 35 #include "content/shell/common/shell_messages.h"
36 #include "content/shell/common/shell_switches.h" 36 #include "content/shell/common/shell_switches.h"
37 #include "net/url_request/url_request_context_getter.h" 37 #include "net/url_request/url_request_context_getter.h"
38 #include "url/gurl.h" 38 #include "url/gurl.h"
39 39
40 #if defined(OS_ANDROID) 40 #if defined(OS_ANDROID)
41 #include "base/android/apk_assets.h" 41 #include "base/android/apk_assets.h"
42 #include "base/android/path_utils.h" 42 #include "base/android/path_utils.h"
43 #include "components/crash/browser/crash_dump_manager_android.h" 43 #include "components/crash/content/browser/crash_dump_manager_android.h"
44 #include "content/shell/android/shell_descriptors.h" 44 #include "content/shell/android/shell_descriptors.h"
45 #endif 45 #endif
46 46
47 #if defined(OS_POSIX) && !defined(OS_MACOSX) 47 #if defined(OS_POSIX) && !defined(OS_MACOSX)
48 #include "base/debug/leak_annotations.h" 48 #include "base/debug/leak_annotations.h"
49 #include "components/crash/app/breakpad_linux.h" 49 #include "components/crash/content/app/breakpad_linux.h"
50 #include "components/crash/browser/crash_handler_host_linux.h" 50 #include "components/crash/content/browser/crash_handler_host_linux.h"
51 #include "content/public/common/content_descriptors.h" 51 #include "content/public/common/content_descriptors.h"
52 #endif 52 #endif
53 53
54 #if defined(OS_WIN) 54 #if defined(OS_WIN)
55 #include "content/common/sandbox_win.h" 55 #include "content/common/sandbox_win.h"
56 #include "sandbox/win/src/sandbox.h" 56 #include "sandbox/win/src/sandbox.h"
57 #endif 57 #endif
58 58
59 namespace content { 59 namespace content {
60 60
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 ShellBrowserContext* 413 ShellBrowserContext*
414 ShellContentBrowserClient::ShellBrowserContextForBrowserContext( 414 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
415 BrowserContext* content_browser_context) { 415 BrowserContext* content_browser_context) {
416 if (content_browser_context == browser_context()) 416 if (content_browser_context == browser_context())
417 return browser_context(); 417 return browser_context();
418 DCHECK_EQ(content_browser_context, off_the_record_browser_context()); 418 DCHECK_EQ(content_browser_context, off_the_record_browser_context());
419 return off_the_record_browser_context(); 419 return off_the_record_browser_context();
420 } 420 }
421 421
422 } // namespace content 422 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_browser_main_parts.cc ('k') | content/shell/tools/content_shell_crash_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698