| 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 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 618 | 618 |
| 619 RendererContentSettingRules rules; | 619 RendererContentSettingRules rules; |
| 620 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules); | 620 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules); |
| 621 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); | 621 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); |
| 622 | 622 |
| 623 #if defined(OS_ANDROID) && defined(USE_LINUX_BREAKPAD) | 623 #if defined(OS_ANDROID) && defined(USE_LINUX_BREAKPAD) |
| 624 InitCrashDumpManager(); | 624 InitCrashDumpManager(); |
| 625 #endif | 625 #endif |
| 626 } | 626 } |
| 627 | 627 |
| 628 content::WebUIControllerFactory* | |
| 629 ChromeContentBrowserClient::GetWebUIControllerFactory() { | |
| 630 return ChromeWebUIControllerFactory::GetInstance(); | |
| 631 } | |
| 632 | |
| 633 GURL ChromeContentBrowserClient::GetEffectiveURL( | 628 GURL ChromeContentBrowserClient::GetEffectiveURL( |
| 634 content::BrowserContext* browser_context, const GURL& url) { | 629 content::BrowserContext* browser_context, const GURL& url) { |
| 635 Profile* profile = Profile::FromBrowserContext(browser_context); | 630 Profile* profile = Profile::FromBrowserContext(browser_context); |
| 636 // Get the effective URL for the given actual URL. If the URL is part of an | 631 // Get the effective URL for the given actual URL. If the URL is part of an |
| 637 // installed app, the effective URL is an extension URL with the ID of that | 632 // installed app, the effective URL is an extension URL with the ID of that |
| 638 // extension as the host. This has the effect of grouping apps together in | 633 // extension as the host. This has the effect of grouping apps together in |
| 639 // a common SiteInstance. | 634 // a common SiteInstance. |
| 640 ExtensionService* extension_service = !profile ? NULL : | 635 ExtensionService* extension_service = !profile ? NULL : |
| 641 extensions::ExtensionSystem::Get(profile)->extension_service(); | 636 extensions::ExtensionSystem::Get(profile)->extension_service(); |
| 642 if (!extension_service) | 637 if (!extension_service) |
| (...skipping 1265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1908 io_thread_application_locale_ = locale; | 1903 io_thread_application_locale_ = locale; |
| 1909 } | 1904 } |
| 1910 | 1905 |
| 1911 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 1906 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
| 1912 const std::string& locale) { | 1907 const std::string& locale) { |
| 1913 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1908 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 1914 io_thread_application_locale_ = locale; | 1909 io_thread_application_locale_ = locale; |
| 1915 } | 1910 } |
| 1916 | 1911 |
| 1917 } // namespace chrome | 1912 } // namespace chrome |
| OLD | NEW |