summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 21:38:53 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 21:38:53 +0000
commitda3044410312b4a80845708910a4388cd104e509 (patch)
treeb85ec29b0d4c20937bc429c0da59f02d1df2718d /android_webview
parenta9b08ccb413ca9689e842393e103e64ba84ee280 (diff)
downloadchromium_src-da3044410312b4a80845708910a4388cd104e509.zip
chromium_src-da3044410312b4a80845708910a4388cd104e509.tar.gz
chromium_src-da3044410312b4a80845708910a4388cd104e509.tar.bz2
components: Move web_contents_delegate_android into web_contents_delegate_android namespace.
BUG=238224 R=joi@chromium.org, joth@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/16073002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/lib/main/webview_entry_point.cc2
-rw-r--r--android_webview/native/aw_web_contents_delegate.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc
index 8b8b039..e7ea8af 100644
--- a/android_webview/lib/main/webview_entry_point.cc
+++ b/android_webview/lib/main/webview_entry_point.cc
@@ -16,7 +16,7 @@ static base::android::RegistrationMethod
{ "NavigationInterception",
navigation_interception::RegisterNavigationInterceptionJni },
{ "WebContentsDelegateAndroid",
- components::RegisterWebContentsDelegateAndroidJni },
+ web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni },
};
// This is called by the VM when the shared library is first loaded.
diff --git a/android_webview/native/aw_web_contents_delegate.h b/android_webview/native/aw_web_contents_delegate.h
index 3df57d3..3d84fbe 100644
--- a/android_webview/native/aw_web_contents_delegate.h
+++ b/android_webview/native/aw_web_contents_delegate.h
@@ -15,7 +15,7 @@ namespace android_webview {
// Should contain WebContentsDelegate code required by WebView that should not
// be part of the Chromium Android port.
class AwWebContentsDelegate
- : public components::WebContentsDelegateAndroid {
+ : public web_contents_delegate_android::WebContentsDelegateAndroid {
public:
AwWebContentsDelegate(JNIEnv* env, jobject obj);
virtual ~AwWebContentsDelegate();