X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fxwalk%2Fruntime%2Fbrowser%2Fui%2Fnative_app_window_tizen.cc;h=50ff11f8a479eebaa2c7d8eb18a2b1dddaa57671;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=40beb316bafd056654a5d496163807f6c4c9876a;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/xwalk/runtime/browser/ui/native_app_window_tizen.cc b/src/xwalk/runtime/browser/ui/native_app_window_tizen.cc index 40beb31..50ff11f 100644 --- a/src/xwalk/runtime/browser/ui/native_app_window_tizen.cc +++ b/src/xwalk/runtime/browser/ui/native_app_window_tizen.cc @@ -53,7 +53,7 @@ static void SetWindowRotation(aura::Window* window, gfx::Display display) { #if defined(OS_TIZEN_MOBILE) // Assumes portrait display; shows overlay indicator in landscape only. bool useOverlay = display.rotation() == gfx::Display::ROTATE_90 || - display.rotation() == gfx::Display::ROTATE_180); + display.rotation() == gfx::Display::ROTATE_180; top_view_layout()->SetUseOverlay(enableOverlay); indicator_widget_->SetDisplay(display); #endif @@ -115,22 +115,25 @@ void NativeAppWindowTizen::Initialize() { DCHECK(root_window); root_window->AddObserver(this); - if (SensorProvider* sensor = SensorProvider::GetInstance()) { - sensor->AddObserver(this); - OnScreenOrientationChanged(sensor->GetScreenOrientation()); + SensorProvider::GetInstance()->AddObserver(this); + + if (SensorProvider::GetInstance()->connected()) { + OnScreenOrientationChanged( + SensorProvider::GetInstance()->GetScreenOrientation()); } } NativeAppWindowTizen::~NativeAppWindowTizen() { - if (SensorProvider::GetInstance()) + if (SensorProvider::GetInstance()->connected()) SensorProvider::GetInstance()->RemoveObserver(this); } void NativeAppWindowTizen::LockOrientation( blink::WebScreenOrientationLockType lock) { orientation_lock_ = lock; - if (SensorProvider* sensor = SensorProvider::GetInstance()) - OnScreenOrientationChanged(sensor->GetScreenOrientation()); + if (SensorProvider::GetInstance()->connected()) + OnScreenOrientationChanged( + SensorProvider::GetInstance()->GetScreenOrientation()); } void NativeAppWindowTizen::ViewHierarchyChanged( @@ -228,6 +231,11 @@ void NativeAppWindowTizen::OnScreenOrientationChanged( SetDisplayRotation(display_); } +void NativeAppWindowTizen::OnSensorConnected() { + OnScreenOrientationChanged( + SensorProvider::GetInstance()->GetScreenOrientation()); +} + void NativeAppWindowTizen::SetDisplayRotation(gfx::Display display) { aura::Window* window = GetNativeWindow()->GetRootWindow(); if (!window->IsVisible())