| 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/public/browser/content_browser_client.h" | 5 #include "content/public/browser/content_browser_client.h" |
| 6 | 6 |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "googleurl/src/gurl.h" |
| 8 #include "ui/gfx/image/image_skia.h" | 9 #include "ui/gfx/image/image_skia.h" |
| 9 | 10 |
| 10 namespace content { | 11 namespace content { |
| 11 | 12 |
| 12 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( | 13 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( |
| 13 const MainFunctionParams& parameters) { | 14 const MainFunctionParams& parameters) { |
| 14 return NULL; | 15 return NULL; |
| 15 } | 16 } |
| 16 | 17 |
| 17 WebContentsView* ContentBrowserClient::OverrideCreateWebContentsView( | 18 WebContentsView* ContentBrowserClient::OverrideCreateWebContentsView( |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 #endif | 217 #endif |
| 217 | 218 |
| 218 #if defined(USE_NSS) | 219 #if defined(USE_NSS) |
| 219 crypto::CryptoModuleBlockingPasswordDelegate* | 220 crypto::CryptoModuleBlockingPasswordDelegate* |
| 220 ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { | 221 ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { |
| 221 return NULL; | 222 return NULL; |
| 222 } | 223 } |
| 223 #endif | 224 #endif |
| 224 | 225 |
| 225 } // namespace content | 226 } // namespace content |
| OLD | NEW |