summaryrefslogtreecommitdiffstats
path: root/content/browser/android
diff options
context:
space:
mode:
authordtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-28 21:24:38 +0000
committerdtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-28 21:24:38 +0000
commit452b4a958d55f8824b0ca9a1397249bfe95ebff3 (patch)
treead06ad800b78ce2bc615ec3ec33a857bc8c4b7b5 /content/browser/android
parent5b69cca2604690eea480d22aeb08687c7b990a65 (diff)
downloadchromium_src-452b4a958d55f8824b0ca9a1397249bfe95ebff3.zip
chromium_src-452b4a958d55f8824b0ca9a1397249bfe95ebff3.tar.gz
chromium_src-452b4a958d55f8824b0ca9a1397249bfe95ebff3.tar.bz2
Enable hiding/showing top controls persistently
Pass down to the renderer whether or not we should allow showing the fullscreen controls as well as hiding. BUG=161303 Review URL: https://chromiumcodereview.appspot.com/12954003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android')
-rw-r--r--content/browser/android/content_view_core_impl.cc12
-rw-r--r--content/browser/android/content_view_core_impl.h6
2 files changed, 14 insertions, 4 deletions
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index bb67051..ccdc2e0 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -1253,10 +1253,16 @@ void ContentViewCoreImpl::ExitFullscreen(JNIEnv* env, jobject obj) {
host->ExitFullscreen();
}
-void ContentViewCoreImpl::EnableHidingTopControls(JNIEnv* env, jobject obj,
- bool enable) {
+void ContentViewCoreImpl::UpdateTopControlsState(JNIEnv* env,
+ jobject obj,
+ bool enable_hiding,
+ bool enable_showing,
+ bool animate) {
RenderViewHost* host = web_contents_->GetRenderViewHost();
- host->Send(new ViewMsg_EnableHidingTopControls(host->GetRoutingID(), enable));
+ host->Send(new ViewMsg_UpdateTopControlsState(host->GetRoutingID(),
+ enable_hiding,
+ enable_showing,
+ animate));
}
void ContentViewCoreImpl::ShowImeIfNeeded(JNIEnv* env, jobject obj) {
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index 6bab21b..72a7256 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -200,7 +200,11 @@ class ContentViewCoreImpl : public ContentViewCore,
void WasResized(JNIEnv* env, jobject obj);
jboolean IsRenderWidgetHostViewReady(JNIEnv* env, jobject obj);
void ExitFullscreen(JNIEnv* env, jobject obj);
- void EnableHidingTopControls(JNIEnv* env, jobject obj, bool enable);
+ void UpdateTopControlsState(JNIEnv* env,
+ jobject obj,
+ bool enable_hiding,
+ bool enable_showing,
+ bool animate);
void ShowImeIfNeeded(JNIEnv* env, jobject obj);
void ShowInterstitialPage(JNIEnv* env,