Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 2374e0c989bd6950b190e540e530b2e4f2bcb0f1..508483a8a2c038be7582fe30a4ebf65ee977d8e5 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -764,6 +764,9 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params) |
target_url_status_(TARGET_NONE), |
selection_text_offset_(0), |
selection_range_(ui::Range::InvalidRange()), |
+#if defined(OS_ANDROID) |
+ top_controls_constraints_(cc::NONE), |
jamesr
2013/06/11 05:11:27
does 'NONE' make sense? the top controls have to e
Jinsuk Kim
2013/06/11 05:23:59
How about 'INVALID' which indicates it is not a va
|
+#endif |
cached_is_main_frame_pinned_to_left_(false), |
cached_is_main_frame_pinned_to_right_(false), |
cached_has_main_frame_horizontal_scrollbar_(false), |
@@ -2342,6 +2345,16 @@ bool RenderViewImpl::handleCurrentKeyboardEvent() { |
return did_execute_command; |
} |
+#if defined(OS_ANDROID) |
+void RenderViewImpl::didScrollWithKeyboard(const WebKit::WebSize& delta) { |
jamesr
2013/06/11 05:11:27
you've declared the function in the header outside
Jinsuk Kim
2013/06/11 05:23:59
Moved #if's inside.
|
+ if (top_controls_constraints_ == cc::NONE || delta.height == 0) |
+ return; |
+ compositor_->UpdateTopControlsState(top_controls_constraints_, |
+ delta.height < 0 ? cc::SHOWN : cc::HIDDEN, |
+ true); |
+} |
+#endif |
+ |
WebKit::WebColorChooser* RenderViewImpl::createColorChooser( |
WebKit::WebColorChooserClient* client, |
const WebKit::WebColor& initial_color) { |