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

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

Issue 2363653002: Cleanup unreachable cert adding code (Closed)
Patch Set: Rebased Created 4 years, 2 months 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
« no previous file with comments | « android_webview/browser/aw_content_browser_client.h ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 AwBrowserContext* AwContentBrowserClient::InitBrowserContext() { 186 AwBrowserContext* AwContentBrowserClient::InitBrowserContext() {
187 base::FilePath user_data_dir; 187 base::FilePath user_data_dir;
188 if (!PathService::Get(base::DIR_ANDROID_APP_DATA, &user_data_dir)) { 188 if (!PathService::Get(base::DIR_ANDROID_APP_DATA, &user_data_dir)) {
189 NOTREACHED() << "Failed to get app data directory for Android WebView"; 189 NOTREACHED() << "Failed to get app data directory for Android WebView";
190 } 190 }
191 browser_context_.reset( 191 browser_context_.reset(
192 new AwBrowserContext(user_data_dir, native_factory_)); 192 new AwBrowserContext(user_data_dir, native_factory_));
193 return browser_context_.get(); 193 return browser_context_.get();
194 } 194 }
195 195
196 void AwContentBrowserClient::AddCertificate(net::CertificateMimeType cert_type,
197 const void* cert_data,
198 size_t cert_size,
199 int render_process_id,
200 int render_frame_id) {
201 if (cert_size > 0)
202 net::android::StoreCertificate(cert_type, cert_data, cert_size);
203 }
204
205 content::BrowserMainParts* AwContentBrowserClient::CreateBrowserMainParts( 196 content::BrowserMainParts* AwContentBrowserClient::CreateBrowserMainParts(
206 const content::MainFunctionParams& parameters) { 197 const content::MainFunctionParams& parameters) {
207 return new AwBrowserMainParts(this); 198 return new AwBrowserMainParts(this);
208 } 199 }
209 200
210 content::WebContentsViewDelegate* 201 content::WebContentsViewDelegate*
211 AwContentBrowserClient::GetWebContentsViewDelegate( 202 AwContentBrowserClient::GetWebContentsViewDelegate(
212 content::WebContents* web_contents) { 203 content::WebContents* web_contents) {
213 return native_factory_->CreateViewDelegate(web_contents); 204 return native_factory_->CreateViewDelegate(web_contents);
214 } 205 }
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 } 516 }
526 return throttles; 517 return throttles;
527 } 518 }
528 519
529 content::DevToolsManagerDelegate* 520 content::DevToolsManagerDelegate*
530 AwContentBrowserClient::GetDevToolsManagerDelegate() { 521 AwContentBrowserClient::GetDevToolsManagerDelegate() {
531 return new AwDevToolsManagerDelegate(); 522 return new AwDevToolsManagerDelegate();
532 } 523 }
533 524
534 } // namespace android_webview 525 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/aw_content_browser_client.h ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698