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

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

Issue 485893007: Rename components/breakpad to components/crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + iOS tests Created 6 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 | Annotate | Revision Log
« no previous file with comments | « content/shell/browser/shell_browser_main_parts.cc ('k') | content/shell/tools/DEPS » ('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 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/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 20 matching lines...) Expand all
31 #include "content/shell/common/shell_messages.h" 31 #include "content/shell/common/shell_messages.h"
32 #include "content/shell/common/shell_switches.h" 32 #include "content/shell/common/shell_switches.h"
33 #include "content/shell/common/webkit_test_helpers.h" 33 #include "content/shell/common/webkit_test_helpers.h"
34 #include "content/shell/geolocation/shell_access_token_store.h" 34 #include "content/shell/geolocation/shell_access_token_store.h"
35 #include "net/url_request/url_request_context_getter.h" 35 #include "net/url_request/url_request_context_getter.h"
36 #include "url/gurl.h" 36 #include "url/gurl.h"
37 37
38 #if defined(OS_ANDROID) 38 #if defined(OS_ANDROID)
39 #include "base/android/path_utils.h" 39 #include "base/android/path_utils.h"
40 #include "base/path_service.h" 40 #include "base/path_service.h"
41 #include "components/breakpad/browser/crash_dump_manager_android.h" 41 #include "components/crash/browser/crash_dump_manager_android.h"
42 #include "content/shell/android/shell_descriptors.h" 42 #include "content/shell/android/shell_descriptors.h"
43 #endif 43 #endif
44 44
45 #if defined(OS_POSIX) && !defined(OS_MACOSX) 45 #if defined(OS_POSIX) && !defined(OS_MACOSX)
46 #include "base/debug/leak_annotations.h" 46 #include "base/debug/leak_annotations.h"
47 #include "components/breakpad/app/breakpad_linux.h" 47 #include "components/crash/app/breakpad_linux.h"
48 #include "components/breakpad/browser/crash_handler_host_linux.h" 48 #include "components/crash/browser/crash_handler_host_linux.h"
49 #include "content/public/common/content_descriptors.h" 49 #include "content/public/common/content_descriptors.h"
50 #endif 50 #endif
51 51
52 #if defined(OS_WIN) 52 #if defined(OS_WIN)
53 #include "content/common/sandbox_win.h" 53 #include "content/common/sandbox_win.h"
54 #include "sandbox/win/src/sandbox.h" 54 #include "sandbox/win/src/sandbox.h"
55 #endif 55 #endif
56 56
57 namespace content { 57 namespace content {
58 58
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 ShellBrowserContext* 424 ShellBrowserContext*
425 ShellContentBrowserClient::ShellBrowserContextForBrowserContext( 425 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
426 BrowserContext* content_browser_context) { 426 BrowserContext* content_browser_context) {
427 if (content_browser_context == browser_context()) 427 if (content_browser_context == browser_context())
428 return browser_context(); 428 return browser_context();
429 DCHECK_EQ(content_browser_context, off_the_record_browser_context()); 429 DCHECK_EQ(content_browser_context, off_the_record_browser_context());
430 return off_the_record_browser_context(); 430 return off_the_record_browser_context();
431 } 431 }
432 432
433 } // namespace content 433 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_browser_main_parts.cc ('k') | content/shell/tools/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698