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

Side by Side Diff: content/browser/android/content_settings.cc

Issue 10798010: Uses gyp "rules" rather than "actions" templates for the JNI generator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Typo on content_jni.gypi Created 8 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 "content/browser/android/content_settings.h" 5 #include "content/browser/android/content_settings.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "content/browser/android/content_view_core_impl.h" 9 #include "content/browser/android/content_view_core_impl.h"
10 #include "content/browser/renderer_host/render_view_host_delegate.h" 10 #include "content/browser/renderer_host/render_view_host_delegate.h"
11 #include "content/browser/renderer_host/render_view_host_impl.h" 11 #include "content/browser/renderer_host/render_view_host_impl.h"
12 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
13 #include "jni/content_settings_jni.h" 13 #include "jni/ContentSettings_jni.h"
14 #include "webkit/glue/user_agent.h" 14 #include "webkit/glue/user_agent.h"
15 #include "webkit/glue/webkit_glue.h" 15 #include "webkit/glue/webkit_glue.h"
16 #include "webkit/glue/webpreferences.h" 16 #include "webkit/glue/webpreferences.h"
17 17
18 using base::android::CheckException; 18 using base::android::CheckException;
19 using base::android::ConvertJavaStringToUTF16; 19 using base::android::ConvertJavaStringToUTF16;
20 using base::android::ConvertUTF16ToJavaString; 20 using base::android::ConvertUTF16ToJavaString;
21 using base::android::ConvertUTF8ToJavaString; 21 using base::android::ConvertUTF8ToJavaString;
22 using base::android::GetClass; 22 using base::android::GetClass;
23 using base::android::GetFieldID; 23 using base::android::GetFieldID;
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 return reinterpret_cast<jint>(content_settings); 294 return reinterpret_cast<jint>(content_settings);
295 } 295 }
296 296
297 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { 297 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
298 // "Version/4.0" had been hardcoded in the legacy WebView. 298 // "Version/4.0" had been hardcoded in the legacy WebView.
299 std::string ua = webkit_glue::BuildUserAgentFromProduct("Version/4.0"); 299 std::string ua = webkit_glue::BuildUserAgentFromProduct("Version/4.0");
300 return base::android::ConvertUTF8ToJavaString(env, ua).Release(); 300 return base::android::ConvertUTF8ToJavaString(env, ua).Release();
301 } 301 }
302 302
303 } // namespace content 303 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/android_browser_process.cc ('k') | content/browser/android/content_view_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698