OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 <limits> | 7 #include <limits> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "android_webview/browser/aw_browser_context.h" | 10 #include "android_webview/browser/aw_browser_context.h" |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 | 83 |
84 struct AwDrawSWFunctionTable; | 84 struct AwDrawSWFunctionTable; |
85 | 85 |
86 using autofill::ContentAutofillDriverFactory; | 86 using autofill::ContentAutofillDriverFactory; |
87 using autofill::AutofillManager; | 87 using autofill::AutofillManager; |
88 using base::android::AttachCurrentThread; | 88 using base::android::AttachCurrentThread; |
89 using base::android::ConvertJavaStringToUTF16; | 89 using base::android::ConvertJavaStringToUTF16; |
90 using base::android::ConvertJavaStringToUTF8; | 90 using base::android::ConvertJavaStringToUTF8; |
91 using base::android::ConvertUTF16ToJavaString; | 91 using base::android::ConvertUTF16ToJavaString; |
92 using base::android::ConvertUTF8ToJavaString; | 92 using base::android::ConvertUTF8ToJavaString; |
| 93 using base::android::JavaParamRef; |
93 using base::android::JavaRef; | 94 using base::android::JavaRef; |
94 using base::android::ScopedJavaGlobalRef; | 95 using base::android::ScopedJavaGlobalRef; |
95 using base::android::ScopedJavaLocalRef; | 96 using base::android::ScopedJavaLocalRef; |
96 using navigation_interception::InterceptNavigationDelegate; | 97 using navigation_interception::InterceptNavigationDelegate; |
97 using content::BrowserThread; | 98 using content::BrowserThread; |
98 using content::ContentViewCore; | 99 using content::ContentViewCore; |
99 using content::WebContents; | 100 using content::WebContents; |
100 | 101 |
101 namespace android_webview { | 102 namespace android_webview { |
102 | 103 |
(...skipping 1201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1304 int routing_id = new_host->GetRoutingID(); | 1305 int routing_id = new_host->GetRoutingID(); |
1305 // At this point, the current RVH may or may not contain a compositor. So | 1306 // At this point, the current RVH may or may not contain a compositor. So |
1306 // compositor_ may be nullptr, in which case | 1307 // compositor_ may be nullptr, in which case |
1307 // BrowserViewRenderer::DidInitializeCompositor() callback is time when the | 1308 // BrowserViewRenderer::DidInitializeCompositor() callback is time when the |
1308 // new compositor is constructed. | 1309 // new compositor is constructed. |
1309 browser_view_renderer_.SetActiveCompositorID( | 1310 browser_view_renderer_.SetActiveCompositorID( |
1310 CompositorID(process_id, routing_id)); | 1311 CompositorID(process_id, routing_id)); |
1311 } | 1312 } |
1312 | 1313 |
1313 } // namespace android_webview | 1314 } // namespace android_webview |
OLD | NEW |