| 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 "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1676 #if defined(OS_WIN) | 1676 #if defined(OS_WIN) |
| 1677 const wchar_t* ChromeContentBrowserClient::GetResourceDllName() { | 1677 const wchar_t* ChromeContentBrowserClient::GetResourceDllName() { |
| 1678 return chrome::kBrowserResourcesDll; | 1678 return chrome::kBrowserResourcesDll; |
| 1679 } | 1679 } |
| 1680 #endif | 1680 #endif |
| 1681 | 1681 |
| 1682 #if defined(USE_NSS) | 1682 #if defined(USE_NSS) |
| 1683 crypto::CryptoModuleBlockingPasswordDelegate* | 1683 crypto::CryptoModuleBlockingPasswordDelegate* |
| 1684 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1684 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 1685 const GURL& url) { | 1685 const GURL& url) { |
| 1686 return browser::NewCryptoModuleBlockingDialogDelegate( | 1686 return chrome::NewCryptoModuleBlockingDialogDelegate( |
| 1687 browser::kCryptoModulePasswordKeygen, url.host()); | 1687 chrome::kCryptoModulePasswordKeygen, url.host()); |
| 1688 } | 1688 } |
| 1689 #endif | 1689 #endif |
| 1690 | 1690 |
| 1691 void ChromeContentBrowserClient::SetApplicationLocale( | 1691 void ChromeContentBrowserClient::SetApplicationLocale( |
| 1692 const std::string& locale) { | 1692 const std::string& locale) { |
| 1693 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1693 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 1694 | 1694 |
| 1695 // This object is guaranteed to outlive all threads so we don't have to | 1695 // This object is guaranteed to outlive all threads so we don't have to |
| 1696 // worry about the lack of refcounting and can just post as Unretained. | 1696 // worry about the lack of refcounting and can just post as Unretained. |
| 1697 // | 1697 // |
| (...skipping 28 matching lines...) Expand all Loading... |
| 1726 partition_id = extension->id(); | 1726 partition_id = extension->id(); |
| 1727 } | 1727 } |
| 1728 | 1728 |
| 1729 // Enforce that IsValidStoragePartitionId() implementation stays in sync. | 1729 // Enforce that IsValidStoragePartitionId() implementation stays in sync. |
| 1730 DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); | 1730 DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); |
| 1731 return partition_id; | 1731 return partition_id; |
| 1732 } | 1732 } |
| 1733 | 1733 |
| 1734 | 1734 |
| 1735 } // namespace chrome | 1735 } // namespace chrome |
| OLD | NEW |