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 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1497 | 1497 |
1498 net::NetLog* ChromeContentBrowserClient::GetNetLog() { | 1498 net::NetLog* ChromeContentBrowserClient::GetNetLog() { |
1499 return g_browser_process->net_log(); | 1499 return g_browser_process->net_log(); |
1500 } | 1500 } |
1501 | 1501 |
1502 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() { | 1502 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() { |
1503 return new ChromeAccessTokenStore(); | 1503 return new ChromeAccessTokenStore(); |
1504 } | 1504 } |
1505 | 1505 |
1506 bool ChromeContentBrowserClient::IsFastShutdownPossible() { | 1506 bool ChromeContentBrowserClient::IsFastShutdownPossible() { |
1507 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 1507 return true; |
1508 return !browser_command_line.HasSwitch(switches::kChromeFrame); | |
1509 } | 1508 } |
1510 | 1509 |
1511 void ChromeContentBrowserClient::OverrideWebkitPrefs( | 1510 void ChromeContentBrowserClient::OverrideWebkitPrefs( |
1512 RenderViewHost* rvh, const GURL& url, WebPreferences* web_prefs) { | 1511 RenderViewHost* rvh, const GURL& url, WebPreferences* web_prefs) { |
1513 Profile* profile = Profile::FromBrowserContext( | 1512 Profile* profile = Profile::FromBrowserContext( |
1514 rvh->GetProcess()->GetBrowserContext()); | 1513 rvh->GetProcess()->GetBrowserContext()); |
1515 PrefService* prefs = profile->GetPrefs(); | 1514 PrefService* prefs = profile->GetPrefs(); |
1516 | 1515 |
1517 FillFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap, | 1516 FillFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap, |
1518 &web_prefs->standard_font_family_map); | 1517 &web_prefs->standard_font_family_map); |
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1909 io_thread_application_locale_ = locale; | 1908 io_thread_application_locale_ = locale; |
1910 } | 1909 } |
1911 | 1910 |
1912 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 1911 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
1913 const std::string& locale) { | 1912 const std::string& locale) { |
1914 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1913 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
1915 io_thread_application_locale_ = locale; | 1914 io_thread_application_locale_ = locale; |
1916 } | 1915 } |
1917 | 1916 |
1918 } // namespace chrome | 1917 } // namespace chrome |
OLD | NEW |