summaryrefslogtreecommitdiffstats
path: root/components/web_contents_delegate_android
diff options
context:
space:
mode:
authorcreis <creis@chromium.org>2014-11-26 09:10:36 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-26 17:10:56 +0000
commitcde28de95a9b96b553970428e6800e78a5ba0394 (patch)
tree3fc40fb52fe2f7bc0024c1ec44e12042bd18929f /components/web_contents_delegate_android
parentdb742bedfaf08c1fefcad22f3c4d854d36360273 (diff)
downloadchromium_src-cde28de95a9b96b553970428e6800e78a5ba0394.zip
chromium_src-cde28de95a9b96b553970428e6800e78a5ba0394.tar.gz
chromium_src-cde28de95a9b96b553970428e6800e78a5ba0394.tar.bz2
Reset user text in a tab if it navigates while in the background.
BUG=431575 TEST=Omnibox shows committed URL after switching back to tab. Review URL: https://codereview.chromium.org/753703002 Cr-Commit-Position: refs/heads/master@{#305822}
Diffstat (limited to 'components/web_contents_delegate_android')
-rw-r--r--components/web_contents_delegate_android/web_contents_delegate_android.cc2
-rw-r--r--components/web_contents_delegate_android/web_contents_delegate_android.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.cc b/components/web_contents_delegate_android/web_contents_delegate_android.cc
index 629cd06..5a6878c 100644
--- a/components/web_contents_delegate_android/web_contents_delegate_android.cc
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.cc
@@ -139,7 +139,7 @@ WebContents* WebContentsDelegateAndroid::OpenURLFromTab(
}
void WebContentsDelegateAndroid::NavigationStateChanged(
- const WebContents* source, content::InvalidateTypes changed_flags) {
+ WebContents* source, content::InvalidateTypes changed_flags) {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
if (obj.is_null())
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.h b/components/web_contents_delegate_android/web_contents_delegate_android.h
index cac909a..9a899bc 100644
--- a/components/web_contents_delegate_android/web_contents_delegate_android.h
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.h
@@ -59,7 +59,7 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {
SkColor color,
const std::vector<content::ColorSuggestion>& suggestions) override;
virtual void NavigationStateChanged(
- const content::WebContents* source,
+ content::WebContents* source,
content::InvalidateTypes changed_flags) override;
virtual void VisibleSSLStateChanged(
const content::WebContents* source) override;