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 1463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1474 | 1474 |
1475 net::NetLog* ChromeContentBrowserClient::GetNetLog() { | 1475 net::NetLog* ChromeContentBrowserClient::GetNetLog() { |
1476 return g_browser_process->net_log(); | 1476 return g_browser_process->net_log(); |
1477 } | 1477 } |
1478 | 1478 |
1479 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() { | 1479 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() { |
1480 return new ChromeAccessTokenStore(); | 1480 return new ChromeAccessTokenStore(); |
1481 } | 1481 } |
1482 | 1482 |
1483 bool ChromeContentBrowserClient::IsFastShutdownPossible() { | 1483 bool ChromeContentBrowserClient::IsFastShutdownPossible() { |
1484 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 1484 return true; |
1485 return !browser_command_line.HasSwitch(switches::kChromeFrame); | |
1486 } | 1485 } |
1487 | 1486 |
1488 void ChromeContentBrowserClient::OverrideWebkitPrefs( | 1487 void ChromeContentBrowserClient::OverrideWebkitPrefs( |
1489 RenderViewHost* rvh, const GURL& url, WebPreferences* web_prefs) { | 1488 RenderViewHost* rvh, const GURL& url, WebPreferences* web_prefs) { |
1490 Profile* profile = Profile::FromBrowserContext( | 1489 Profile* profile = Profile::FromBrowserContext( |
1491 rvh->GetProcess()->GetBrowserContext()); | 1490 rvh->GetProcess()->GetBrowserContext()); |
1492 PrefService* prefs = profile->GetPrefs(); | 1491 PrefService* prefs = profile->GetPrefs(); |
1493 | 1492 |
1494 FillFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap, | 1493 FillFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap, |
1495 &web_prefs->standard_font_family_map); | 1494 &web_prefs->standard_font_family_map); |
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1881 partition_id = extension->id(); | 1880 partition_id = extension->id(); |
1882 } | 1881 } |
1883 | 1882 |
1884 // Enforce that IsValidStoragePartitionId() implementation stays in sync. | 1883 // Enforce that IsValidStoragePartitionId() implementation stays in sync. |
1885 DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); | 1884 DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); |
1886 return partition_id; | 1885 return partition_id; |
1887 } | 1886 } |
1888 | 1887 |
1889 | 1888 |
1890 } // namespace chrome | 1889 } // namespace chrome |
OLD | NEW |