| 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 "android_webview/browser/aw_content_browser_client.h" | 5 #include "android_webview/browser/aw_content_browser_client.h" |
| 6 | 6 |
| 7 #include "android_webview/browser/aw_browser_context.h" | 7 #include "android_webview/browser/aw_browser_context.h" |
| 8 #include "android_webview/browser/aw_browser_main_parts.h" | 8 #include "android_webview/browser/aw_browser_main_parts.h" |
| 9 #include "android_webview/browser/aw_contents_client_bridge_base.h" | 9 #include "android_webview/browser/aw_contents_client_bridge_base.h" |
| 10 #include "android_webview/browser/aw_contents_io_thread_client.h" | 10 #include "android_webview/browser/aw_contents_io_thread_client.h" |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 | 111 |
| 112 } // anonymous namespace | 112 } // anonymous namespace |
| 113 | 113 |
| 114 // static | 114 // static |
| 115 std::string AwContentBrowserClient::GetAcceptLangsImpl() { | 115 std::string AwContentBrowserClient::GetAcceptLangsImpl() { |
| 116 // Start with the current locale. | 116 // Start with the current locale. |
| 117 std::string langs = g_locale_manager->GetLocale(); | 117 std::string langs = g_locale_manager->GetLocale(); |
| 118 | 118 |
| 119 // If we're not en-US, add in en-US which will be | 119 // If we're not en-US, add in en-US which will be |
| 120 // used with a lower q-value. | 120 // used with a lower q-value. |
| 121 if (base::StringToLowerASCII(langs) != "en-us") { | 121 if (base::ToLowerASCII(langs) != "en-us") { |
| 122 langs += ",en-US"; | 122 langs += ",en-US"; |
| 123 } | 123 } |
| 124 return langs; | 124 return langs; |
| 125 } | 125 } |
| 126 | 126 |
| 127 // static | 127 // static |
| 128 AwBrowserContext* AwContentBrowserClient::GetAwBrowserContext() { | 128 AwBrowserContext* AwContentBrowserClient::GetAwBrowserContext() { |
| 129 return AwBrowserContext::GetDefault(); | 129 return AwBrowserContext::GetDefault(); |
| 130 } | 130 } |
| 131 | 131 |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 | 429 |
| 430 #if defined(VIDEO_HOLE) | 430 #if defined(VIDEO_HOLE) |
| 431 content::ExternalVideoSurfaceContainer* | 431 content::ExternalVideoSurfaceContainer* |
| 432 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 432 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
| 433 content::WebContents* web_contents) { | 433 content::WebContents* web_contents) { |
| 434 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); | 434 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); |
| 435 } | 435 } |
| 436 #endif | 436 #endif |
| 437 | 437 |
| 438 } // namespace android_webview | 438 } // namespace android_webview |
| OLD | NEW |