| 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/shell/shell.h" | 9 #include "content/shell/shell.h" |
| 10 #include "content/shell/shell_browser_context.h" |
| 10 #include "content/shell/shell_browser_main_parts.h" | 11 #include "content/shell/shell_browser_main_parts.h" |
| 11 #include "content/shell/shell_devtools_delegate.h" | 12 #include "content/shell/shell_devtools_delegate.h" |
| 12 #include "content/shell/shell_render_view_host_observer.h" | 13 #include "content/shell/shell_render_view_host_observer.h" |
| 13 #include "content/shell/shell_switches.h" | 14 #include "content/shell/shell_switches.h" |
| 14 #include "googleurl/src/gurl.h" | 15 #include "googleurl/src/gurl.h" |
| 15 #include "third_party/skia/include/core/SkBitmap.h" | 16 #include "third_party/skia/include/core/SkBitmap.h" |
| 16 | 17 |
| 17 namespace content { | 18 namespace content { |
| 18 | 19 |
| 19 ShellContentBrowserClient::ShellContentBrowserClient() | 20 ShellContentBrowserClient::ShellContentBrowserClient() |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 #endif | 342 #endif |
| 342 | 343 |
| 343 #if defined(USE_NSS) | 344 #if defined(USE_NSS) |
| 344 crypto::CryptoModuleBlockingPasswordDelegate* | 345 crypto::CryptoModuleBlockingPasswordDelegate* |
| 345 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { | 346 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { |
| 346 return NULL; | 347 return NULL; |
| 347 } | 348 } |
| 348 #endif | 349 #endif |
| 349 | 350 |
| 350 ShellBrowserContext* ShellContentBrowserClient::browser_context() { | 351 ShellBrowserContext* ShellContentBrowserClient::browser_context() { |
| 351 return shell_browser_main_parts_->browser_context(); | 352 return ShellBrowserContext::GetInstance(); |
| 352 } | 353 } |
| 353 | 354 |
| 354 } // namespace content | 355 } // namespace content |
| OLD | NEW |