Gets chrome --mus some what working

ash/shell.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 72 matching lines @@
 #include "ash/display/screen_position_controller.h"
 #include "ash/display/shutdown_observer_chromeos.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/first_run/first_run_helper_impl.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/ime/input_method_event_handler.h"
 #include "ash/laser/laser_pointer_controller.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
+#include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell_init_params.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/system/chromeos/power/power_event_observer.h"
 #include "ash/system/chromeos/power/video_activity_notifier.h"
 #include "ash/system/chromeos/screen_layout_observer.h"
 #include "ash/touch/ash_touch_transform_controller.h"
 #include "ash/utility/screenshot_controller.h"
 #include "ash/virtual_keyboard_controller.h"
@@ skipping 199 matching lines @@
 aura::Window* Shell::GetContainer(aura::Window* root_window, int container_id) {
   return root_window->GetChildById(container_id);
 }
 
 // static
 const aura::Window* Shell::GetContainer(const aura::Window* root_window,
                                         int container_id) {
   return root_window->GetChildById(container_id);
 }
 
+// static
+Config Shell::GetConfig() {
+  return GetInstance()->wm_shell_->GetConfig();
+}
+
 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView(
     views::Widget* widget) {
   // Use translucent-style window frames for dialogs.
   return new CustomFrameViewAsh(widget);
 }
 
 void Shell::SetDisplayWorkAreaInsets(Window* contains,
                                      const gfx::Insets& insets) {
   wm_shell_->SetDisplayWorkAreaInsets(WmWindow::Get(contains), insets);
 }
@@ skipping 107 matching lines @@
   for (WmWindow* root_window : wm_shell_->GetAllRootWindows())
     root_window->GetRootWindowController()->CreateShelfView();
 }
 
 void Shell::SetLargeCursorSizeInDip(int large_cursor_size_in_dip) {
   window_tree_host_manager_->cursor_window_controller()
       ->SetLargeCursorSizeInDip(large_cursor_size_in_dip);
 }
 
 void Shell::SetCursorCompositingEnabled(bool enabled) {
-  window_tree_host_manager_->cursor_window_controller()
-      ->SetCursorCompositingEnabled(enabled);
-  native_cursor_manager_->SetNativeCursorEnabled(!enabled);
+  if (GetConfig() == Config::CLASSIC) {
+    // TODO: needs to work in mus. http://crbug.com/705592.
+    window_tree_host_manager_->cursor_window_controller()
+        ->SetCursorCompositingEnabled(enabled);
+    native_cursor_manager_->SetNativeCursorEnabled(!enabled);
+  }
 }
 
 void Shell::DoInitialWorkspaceAnimation() {
   return GetPrimaryRootWindowController()
       ->workspace_controller()
       ->DoInitialAnimation();
 }
 
 void Shell::AddShellObserver(ShellObserver* observer) {
   shell_observers_.AddObserver(observer);
@@ skipping 319 matching lines @@
   wallpaper_delegate_.reset();
   pref_store_ = nullptr;
   shell_delegate_.reset();
 
   DCHECK(instance_ == this);
   instance_ = nullptr;
 }
 
 void Shell::Init(const ShellInitParams& init_params) {
   const bool is_mash = wm_shell_->IsRunningInMash();
+  const Config config = wm_shell_->GetConfig();
 
   blocking_pool_ = init_params.blocking_pool;
 
   wallpaper_delegate_ = shell_delegate_->CreateWallpaperDelegate();
 
   // Can be null in tests.
   if (shell_delegate_->GetShellConnector()) {
     prefs::mojom::PreferencesServiceFactoryPtr pref_factory_ptr;
     shell_delegate_->GetShellConnector()->BindInterface(
         prefs::mojom::kServiceName, &pref_factory_ptr);
@@ skipping 29 matching lines @@
     app_list_delegate_impl_ = base::MakeUnique<AppListDelegateImpl>();
 
   // TODO(sky): move creation to WmShell.
   if (!is_mash)
     immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>();
 
   scoped_overview_animation_settings_factory_.reset(
       new ScopedOverviewAnimationSettingsFactoryAura);
   window_positioner_ = base::MakeUnique<WindowPositioner>();
 
-  if (!is_mash) {
+  if (config == Config::CLASSIC) {
+    // TODO: needs to work in mus. http://crbug.com/705592.
     native_cursor_manager_ = new AshNativeCursorManager;
     cursor_manager_.reset(
         new CursorManager(base::WrapUnique(native_cursor_manager_)));
   }
 
   shell_delegate_->PreInit();
   bool display_initialized = true;
-  if (!is_mash) {
+  if (config == Config::CLASSIC) {
+    // TODO: decide if this needs to be made to work in Config::MUS.
+    // http://crbug.com/705595.
     display_initialized = display_manager_->InitFromCommandLine();
 
     display_configuration_controller_.reset(new DisplayConfigurationController(
         display_manager_.get(), window_tree_host_manager_.get()));
 
 #if defined(USE_OZONE)
     display_configurator_->Init(
         ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate(),
         !gpu_support_->IsPanelFittingDisabled());
 #elif defined(USE_X11)
@@ skipping 70 matching lines @@
   }
 
   if (cursor_manager_) {
     cursor_manager_->SetDisplay(
         display::Screen::GetScreen()->GetPrimaryDisplay());
   }
 
   accelerator_controller_ = wm_shell_->CreateAcceleratorController();
   maximize_mode_controller_ = base::MakeUnique<MaximizeModeController>();
 
-  if (!is_mash) {
+  if (config == Config::CLASSIC) {
+    // Not applicable to mus/mash as events are already routed to InputMethod
+    // first.
     AddPreTargetHandler(
         window_tree_host_manager_->input_method_event_handler());
   }
 
   magnifier_key_scroll_handler_ = MagnifierKeyScroller::CreateHandler();
   AddPreTargetHandler(magnifier_key_scroll_handler_.get());
   speech_feedback_handler_ = SpokenFeedbackToggler::CreateHandler();
   AddPreTargetHandler(speech_feedback_handler_.get());
 
   // The order in which event filters are added is significant.
@@ skipping 289 matching lines @@
 
   // Only trigger an update in mash because with classic ash chrome calls
   // UpdateAfterLoginStatusChange() directly.
   if (wm_shell_->IsRunningInMash()) {
     // TODO(jamescook): Should this call Shell::OnLoginStatusChanged() too?
     UpdateAfterLoginStatusChange(session_controller_->GetLoginStatus());
   }
 }
 
 }  // namespace ash