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

Unified Diff: chrome/browser/android/voice_search_tab_helper.cc

Issue 357203003: Move webpreferences.* from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android fix - webview() -> web_view 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/renderer/print_web_view_helper.cc ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/voice_search_tab_helper.cc
diff --git a/chrome/browser/android/voice_search_tab_helper.cc b/chrome/browser/android/voice_search_tab_helper.cc
index f76b85d799fe9cbcf0bab35302f25c8051942452..c8f10db3662fae873a0708f60ee2a395dd6b40b3 100644
--- a/chrome/browser/android/voice_search_tab_helper.cc
+++ b/chrome/browser/android/voice_search_tab_helper.cc
@@ -7,8 +7,8 @@
#include "components/google/core/browser/google_util.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/common/web_preferences.h"
#include "jni/VoiceSearchTabHelper_jni.h"
-#include "webkit/common/webpreferences.h"
using content::WebContents;
@@ -22,7 +22,7 @@ static void UpdateAutoplayStatus(JNIEnv* env,
jobject j_web_contents) {
WebContents* web_contents = WebContents::FromJavaWebContents(j_web_contents);
content::RenderViewHost* host = web_contents->GetRenderViewHost();
- WebPreferences prefs = host->GetWebkitPreferences();
+ content::WebPreferences prefs = host->GetWebkitPreferences();
// In the case where media autoplay has been enabled by default (e.g. in
// performance media tests) do not update it based on navigation changes.
« no previous file with comments | « android_webview/renderer/print_web_view_helper.cc ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698