| Index: content/browser/android/content_view_core_impl.cc
|
| diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
|
| index d1f561e69fe13d5b4bf5ea90bced4151b0dec3ff..89a1e5ac15962e780e4db6f6dcdfe1e094f470a8 100644
|
| --- a/content/browser/android/content_view_core_impl.cc
|
| +++ b/content/browser/android/content_view_core_impl.cc
|
| @@ -30,7 +30,6 @@
|
| #include "content/browser/renderer_host/render_view_host_impl.h"
|
| #include "content/browser/renderer_host/render_widget_host_impl.h"
|
| #include "content/browser/renderer_host/render_widget_host_view_android.h"
|
| -#include "content/browser/screen_orientation/screen_orientation_dispatcher_host.h"
|
| #include "content/browser/ssl/ssl_host_state.h"
|
| #include "content/browser/web_contents/web_contents_view_android.h"
|
| #include "content/common/input/web_input_event_traits.h"
|
| @@ -1782,33 +1781,6 @@
|
| RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
|
| web_contents_->GetRenderViewHost());
|
| rvhi->SendOrientationChangeEvent(device_orientation_);
|
| -
|
| - // TODO(mlamouri): temporary plumbing for Screen Orientation, this will change
|
| - // in the future. It might leave ContentViewCoreImpl or simply replace the
|
| - // SendOrientationChangeEvent call above.
|
| - blink::WebScreenOrientation orientation =
|
| - blink::WebScreenOrientationPortraitPrimary;
|
| -
|
| - switch (device_orientation_) {
|
| - case 0:
|
| - orientation = blink::WebScreenOrientationPortraitPrimary;
|
| - break;
|
| - case 90:
|
| - orientation = blink::WebScreenOrientationLandscapePrimary;
|
| - break;
|
| - case -90:
|
| - orientation = blink::WebScreenOrientationLandscapeSecondary;
|
| - break;
|
| - case 180:
|
| - orientation = blink::WebScreenOrientationPortraitSecondary;
|
| - break;
|
| - default:
|
| - NOTREACHED();
|
| - }
|
| -
|
| - static_cast<RenderProcessHostImpl*>(web_contents_->GetRenderProcessHost())->
|
| - screen_orientation_dispatcher_host()->
|
| - OnOrientationChange(orientation);
|
| }
|
|
|
| void ContentViewCoreImpl::ExtractSmartClipData(JNIEnv* env,
|
|
|