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 "googleurl/src/gurl.h" |
9 #include "ui/gfx/image/image_skia.h" | 9 #include "ui/gfx/image/image_skia.h" |
10 | 10 |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 BrowserContext* browser_context, | 170 BrowserContext* browser_context, |
171 const std::string& partition_id) { | 171 const std::string& partition_id) { |
172 // Since the GetStoragePartitionIdForChildProcess() only generates empty | 172 // Since the GetStoragePartitionIdForChildProcess() only generates empty |
173 // strings, we should only ever see empty strings coming back. | 173 // strings, we should only ever see empty strings coming back. |
174 return partition_id.empty(); | 174 return partition_id.empty(); |
175 } | 175 } |
176 | 176 |
177 void ContentBrowserClient::GetStoragePartitionConfigForSite( | 177 void ContentBrowserClient::GetStoragePartitionConfigForSite( |
178 BrowserContext* browser_context, | 178 BrowserContext* browser_context, |
179 const GURL& site, | 179 const GURL& site, |
| 180 bool can_be_default, |
180 std::string* partition_domain, | 181 std::string* partition_domain, |
181 std::string* partition_name, | 182 std::string* partition_name, |
182 bool* in_memory) { | 183 bool* in_memory) { |
183 partition_domain->clear(); | 184 partition_domain->clear(); |
184 partition_name->clear(); | 185 partition_name->clear(); |
185 *in_memory = false; | 186 *in_memory = false; |
186 } | 187 } |
187 | 188 |
188 MediaObserver* ContentBrowserClient::GetMediaObserver() { | 189 MediaObserver* ContentBrowserClient::GetMediaObserver() { |
189 return NULL; | 190 return NULL; |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 #endif | 265 #endif |
265 | 266 |
266 #if defined(USE_NSS) | 267 #if defined(USE_NSS) |
267 crypto::CryptoModuleBlockingPasswordDelegate* | 268 crypto::CryptoModuleBlockingPasswordDelegate* |
268 ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { | 269 ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { |
269 return NULL; | 270 return NULL; |
270 } | 271 } |
271 #endif | 272 #endif |
272 | 273 |
273 } // namespace content | 274 } // namespace content |
OLD | NEW |