| OLD | NEW |
| 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_content_browser_client.h" | 5 #include "content/shell/shell_content_browser_client.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "content/public/browser/resource_dispatcher_host.h" | 9 #include "content/public/browser/resource_dispatcher_host.h" |
| 10 #include "content/shell/shell.h" | 10 #include "content/shell/shell.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 void ShellContentBrowserClient::SiteInstanceDeleting( | 86 void ShellContentBrowserClient::SiteInstanceDeleting( |
| 87 SiteInstance* site_instance) { | 87 SiteInstance* site_instance) { |
| 88 } | 88 } |
| 89 | 89 |
| 90 bool ShellContentBrowserClient::ShouldSwapProcessesForNavigation( | 90 bool ShellContentBrowserClient::ShouldSwapProcessesForNavigation( |
| 91 const GURL& current_url, | 91 const GURL& current_url, |
| 92 const GURL& new_url) { | 92 const GURL& new_url) { |
| 93 return false; | 93 return false; |
| 94 } | 94 } |
| 95 | 95 |
| 96 bool ShellContentBrowserClient::ShouldSwapProcessesForRedirect( |
| 97 ResourceContext* resource_context, const GURL& current_url, |
| 98 const GURL& new_url) { |
| 99 return false; |
| 100 } |
| 101 |
| 96 std::string ShellContentBrowserClient::GetCanonicalEncodingNameByAliasName( | 102 std::string ShellContentBrowserClient::GetCanonicalEncodingNameByAliasName( |
| 97 const std::string& alias_name) { | 103 const std::string& alias_name) { |
| 98 return std::string(); | 104 return std::string(); |
| 99 } | 105 } |
| 100 | 106 |
| 101 void ShellContentBrowserClient::AppendExtraCommandLineSwitches( | 107 void ShellContentBrowserClient::AppendExtraCommandLineSwitches( |
| 102 CommandLine* command_line, int child_process_id) { | 108 CommandLine* command_line, int child_process_id) { |
| 103 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) | 109 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) |
| 104 command_line->AppendSwitch(switches::kDumpRenderTree); | 110 command_line->AppendSwitch(switches::kDumpRenderTree); |
| 105 } | 111 } |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { | 360 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { |
| 355 return NULL; | 361 return NULL; |
| 356 } | 362 } |
| 357 #endif | 363 #endif |
| 358 | 364 |
| 359 ShellBrowserContext* ShellContentBrowserClient::browser_context() { | 365 ShellBrowserContext* ShellContentBrowserClient::browser_context() { |
| 360 return shell_browser_main_parts_->browser_context(); | 366 return shell_browser_main_parts_->browser_context(); |
| 361 } | 367 } |
| 362 | 368 |
| 363 } // namespace content | 369 } // namespace content |
| OLD | NEW |