Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1300)

Side by Side Diff: android_webview/browser/aw_content_browser_client.cc

Issue 2578003002: Move |GetCanonicalEncodingNameByAliasName| to base/i18n (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <utility> 7 #include <utility>
8 8
9 #include "android_webview/browser/aw_browser_context.h" 9 #include "android_webview/browser/aw_browser_context.h"
10 #include "android_webview/browser/aw_browser_main_parts.h" 10 #include "android_webview/browser/aw_browser_main_parts.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 // even if access to file: scheme is not granted to the child process. 252 // even if access to file: scheme is not granted to the child process.
253 return !IsAndroidSpecialFileUrl(url); 253 return !IsAndroidSpecialFileUrl(url);
254 } 254 }
255 for (size_t i = 0; i < arraysize(kProtocolList); ++i) { 255 for (size_t i = 0; i < arraysize(kProtocolList); ++i) {
256 if (scheme == kProtocolList[i]) 256 if (scheme == kProtocolList[i])
257 return true; 257 return true;
258 } 258 }
259 return net::URLRequest::IsHandledProtocol(scheme); 259 return net::URLRequest::IsHandledProtocol(scheme);
260 } 260 }
261 261
262 std::string AwContentBrowserClient::GetCanonicalEncodingNameByAliasName(
263 const std::string& alias_name) {
264 return alias_name;
265 }
266
267 void AwContentBrowserClient::AppendExtraCommandLineSwitches( 262 void AwContentBrowserClient::AppendExtraCommandLineSwitches(
268 base::CommandLine* command_line, 263 base::CommandLine* command_line,
269 int child_process_id) { 264 int child_process_id) {
270 if (command_line->HasSwitch(switches::kSingleProcess)) { 265 if (command_line->HasSwitch(switches::kSingleProcess)) {
271 NOTREACHED() << "Android WebView does not support multi-process yet"; 266 NOTREACHED() << "Android WebView does not support multi-process yet";
272 } else { 267 } else {
273 // The only kind of a child process WebView can have is renderer. 268 // The only kind of a child process WebView can have is renderer.
274 DCHECK_EQ(switches::kRendererProcess, 269 DCHECK_EQ(switches::kRendererProcess,
275 command_line->GetSwitchValueASCII(switches::kProcessType)); 270 command_line->GetSwitchValueASCII(switches::kProcessType));
276 } 271 }
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 542
548 void AwContentBrowserClient::RegisterRenderFrameMojoInterfaces( 543 void AwContentBrowserClient::RegisterRenderFrameMojoInterfaces(
549 service_manager::InterfaceRegistry* registry, 544 service_manager::InterfaceRegistry* registry,
550 content::RenderFrameHost* render_frame_host) { 545 content::RenderFrameHost* render_frame_host) {
551 registry->AddInterface( 546 registry->AddInterface(
552 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver, 547 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver,
553 render_frame_host)); 548 render_frame_host));
554 } 549 }
555 550
556 } // namespace android_webview 551 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698