| Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| index 0bf8d127f9011ab5a987ce4fb21b721445646563..1001c3a38744886e358bb5afceb12b79719eae65 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| @@ -423,9 +423,15 @@ void DesktopNativeWidgetAura::InitNativeWidget(
|
| content_window_container_->Show();
|
| content_window_container_->AddChild(content_window_);
|
|
|
| + //TODO(mfomitchev): Hack
|
| +#if defined(OS_ANDROID)
|
| + desktop_window_tree_host_ = params.desktop_window_tree_host ?
|
| + params.desktop_window_tree_host : nullptr;
|
| +#else
|
| desktop_window_tree_host_ = params.desktop_window_tree_host ?
|
| params.desktop_window_tree_host :
|
| DesktopWindowTreeHost::Create(native_widget_delegate_, this);
|
| +#endif
|
| host_.reset(desktop_window_tree_host_->AsWindowTreeHost());
|
| desktop_window_tree_host_->Init(content_window_, params);
|
|
|
| @@ -456,10 +462,12 @@ void DesktopNativeWidgetAura::InitNativeWidget(
|
| // The host's dispatcher must be added to |native_cursor_manager_| before
|
| // OnNativeWidgetCreated() is called.
|
| cursor_reference_count_++;
|
| +#if !defined(OS_ANDROID)
|
| if (!native_cursor_manager_) {
|
| native_cursor_manager_ = new DesktopNativeCursorManager(
|
| DesktopCursorLoaderUpdater::Create());
|
| }
|
| +#endif
|
| if (!cursor_manager_) {
|
| cursor_manager_ = new wm::CursorManager(
|
| scoped_ptr<wm::NativeCursorManager>(native_cursor_manager_));
|
| @@ -937,7 +945,11 @@ void DesktopNativeWidgetAura::SetVisibilityAnimationTransition(
|
| }
|
|
|
| ui::NativeTheme* DesktopNativeWidgetAura::GetNativeTheme() const {
|
| +#if defined(OS_ANDROID)
|
| + return nullptr;
|
| +#else
|
| return DesktopWindowTreeHost::GetNativeTheme(content_window_);
|
| +#endif
|
| }
|
|
|
| void DesktopNativeWidgetAura::OnRootViewLayout() {
|
|
|