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

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

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 years, 5 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
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_io_thread_client_impl.h" 5 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <utility> 8 #include <utility>
9 9
10 #include "android_webview/common/devtools_instrumentation.h" 10 #include "android_webview/common/devtools_instrumentation.h"
(...skipping 18 matching lines...) Expand all
29 #include "url/gurl.h" 29 #include "url/gurl.h"
30 30
31 using base::android::AttachCurrentThread; 31 using base::android::AttachCurrentThread;
32 using base::android::ConvertUTF8ToJavaString; 32 using base::android::ConvertUTF8ToJavaString;
33 using base::android::JavaRef; 33 using base::android::JavaRef;
34 using base::android::ScopedJavaLocalRef; 34 using base::android::ScopedJavaLocalRef;
35 using base::android::ToJavaArrayOfStrings; 35 using base::android::ToJavaArrayOfStrings;
36 using base::LazyInstance; 36 using base::LazyInstance;
37 using content::BrowserThread; 37 using content::BrowserThread;
38 using content::RenderFrameHost; 38 using content::RenderFrameHost;
39 using content::ResourceType;
39 using content::WebContents; 40 using content::WebContents;
40 using std::map; 41 using std::map;
41 using std::pair; 42 using std::pair;
42 using std::string; 43 using std::string;
43 using std::vector; 44 using std::vector;
44 45
45 namespace android_webview { 46 namespace android_webview {
46 47
47 namespace { 48 namespace {
48 49
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 373
373 Java_AwContentsIoThreadClient_newLoginRequest( 374 Java_AwContentsIoThreadClient_newLoginRequest(
374 env, java_object_.obj(), jrealm.obj(), jaccount.obj(), jargs.obj()); 375 env, java_object_.obj(), jrealm.obj(), jaccount.obj(), jargs.obj());
375 } 376 }
376 377
377 bool RegisterAwContentsIoThreadClientImpl(JNIEnv* env) { 378 bool RegisterAwContentsIoThreadClientImpl(JNIEnv* env) {
378 return RegisterNativesImpl(env); 379 return RegisterNativesImpl(env);
379 } 380 }
380 381
381 } // namespace android_webview 382 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698