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

Side by Side Diff: android_webview/native/aw_contents.cc

Issue 13006020: net: extract net/cert out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | android_webview/native/aw_contents_client_bridge.cc » ('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/native/aw_contents.h" 5 #include "android_webview/native/aw_contents.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/browser_view_renderer_impl.h" 9 #include "android_webview/browser/browser_view_renderer_impl.h"
10 #include "android_webview/browser/net_disk_cache_remover.h" 10 #include "android_webview/browser/net_disk_cache_remover.h"
(...skipping 20 matching lines...) Expand all
31 #include "components/navigation_interception/intercept_navigation_delegate.h" 31 #include "components/navigation_interception/intercept_navigation_delegate.h"
32 #include "content/public/browser/android/content_view_core.h" 32 #include "content/public/browser/android/content_view_core.h"
33 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
34 #include "content/public/browser/cert_store.h" 34 #include "content/public/browser/cert_store.h"
35 #include "content/public/browser/navigation_entry.h" 35 #include "content/public/browser/navigation_entry.h"
36 #include "content/public/browser/render_process_host.h" 36 #include "content/public/browser/render_process_host.h"
37 #include "content/public/browser/render_view_host.h" 37 #include "content/public/browser/render_view_host.h"
38 #include "content/public/browser/web_contents.h" 38 #include "content/public/browser/web_contents.h"
39 #include "content/public/common/ssl_status.h" 39 #include "content/public/common/ssl_status.h"
40 #include "jni/AwContents_jni.h" 40 #include "jni/AwContents_jni.h"
41 #include "net/base/x509_certificate.h" 41 #include "net/cert/x509_certificate.h"
42 #include "ui/gfx/android/java_bitmap.h" 42 #include "ui/gfx/android/java_bitmap.h"
43 43
44 struct AwDrawSWFunctionTable; 44 struct AwDrawSWFunctionTable;
45 45
46 using base::android::AttachCurrentThread; 46 using base::android::AttachCurrentThread;
47 using base::android::ConvertJavaStringToUTF16; 47 using base::android::ConvertJavaStringToUTF16;
48 using base::android::ConvertJavaStringToUTF8; 48 using base::android::ConvertJavaStringToUTF8;
49 using base::android::ConvertUTF16ToJavaString; 49 using base::android::ConvertUTF16ToJavaString;
50 using base::android::ConvertUTF8ToJavaString; 50 using base::android::ConvertUTF8ToJavaString;
51 using base::android::JavaRef; 51 using base::android::JavaRef;
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 if (enabled) { 699 if (enabled) {
700 mode = invalidation_only ? 700 mode = invalidation_only ?
701 BrowserViewRenderer::kOnNewPictureInvalidationOnly : 701 BrowserViewRenderer::kOnNewPictureInvalidationOnly :
702 BrowserViewRenderer::kOnNewPictureEnabled; 702 BrowserViewRenderer::kOnNewPictureEnabled;
703 } 703 }
704 704
705 browser_view_renderer_->EnableOnNewPicture(mode); 705 browser_view_renderer_->EnableOnNewPicture(mode);
706 } 706 }
707 707
708 } // namespace android_webview 708 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | android_webview/native/aw_contents_client_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698