Removes ShellPort::IsRunningInMash()

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 36297cd4995c572f873847060af22f85c2741747..7b8cd995ea70c2209dc7608df34ea216fb7d68cf 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -225,10 +225,11 @@ Shell* Shell::CreateInstance(const ShellInitParams& init_params) {
   ShellPort* shell_port = init_params.shell_port;
   if (!shell_port)
     shell_port = new ShellPortClassic();
-  instance_ = new Shell(base::WrapUnique<ShellDelegate>(init_params.delegate),

[msw, 2017/04/12 17:46:59]

q: Is there a reason for changing when Shell::instance_ is assigned in this CL?
It seems fine (nothing appears instantiate a Shell instance without calling
CreateInstance), but it seems slightly odd to include in this CL.

[sky, 2017/04/12 17:53:18]

Ya, sorry, good question. The issue is that GetAshConfig() is called from the
constructor (line 575). But I think assigning instance_ in the constructor is a
bit risky. So, I changed the code back to what it was and in the constructor it
uses shell_port_->GetAshConfig() directly.

[msw, 2017/04/12 18:03:08]

Gotcha.

-                        base::WrapUnique<ShellPort>(shell_port));
-  instance_->Init(init_params);
-  return instance_;
+  Shell* shell =
+      new Shell(base::WrapUnique<ShellDelegate>(init_params.delegate),
+                base::WrapUnique<ShellPort>(shell_port));
+  shell->Init(init_params);
+  return shell;
 }
 
 // static
@@ -363,7 +364,7 @@ void Shell::DeactivateKeyboard() {
 }
 
 bool Shell::ShouldSaveDisplaySettings() {
-  DCHECK(!shell_port_->IsRunningInMash());
+  DCHECK(GetAshConfig() != Config::MASH);
   return !(
       screen_orientation_controller_->ignore_display_configuration_updates() ||
       resolution_notification_controller_->DoesNotificationTimeout());
@@ -571,7 +572,9 @@ Shell::Shell(std::unique_ptr<ShellDelegate> shell_delegate,
   // TODO(sky): better refactor cash/mash dependencies. Perhaps put all cash
   // state on ShellPortClassic. http://crbug.com/671246.
 
-  if (!shell_port_->IsRunningInMash()) {
+  instance_ = this;
+
+  if (GetAshConfig() != Config::MASH) {
     gpu_support_.reset(shell_delegate_->CreateGPUSupport());
     display_manager_.reset(ScreenAsh::CreateDisplayManager());
     window_tree_host_manager_.reset(new WindowTreeHostManager);
@@ -769,7 +772,6 @@ Shell::~Shell() {
 }
 
 void Shell::Init(const ShellInitParams& init_params) {
-  const bool is_mash = shell_port_->IsRunningInMash();
   const Config config = shell_port_->GetAshConfig();
 
   blocking_pool_ = init_params.blocking_pool;
@@ -777,7 +779,7 @@ void Shell::Init(const ShellInitParams& init_params) {
   wallpaper_delegate_ = shell_delegate_->CreateWallpaperDelegate();
 
   // Can be null in tests.
-  if (shell_port_->IsRunningInMash() && shell_delegate_->GetShellConnector()) {
+  if (config == Config::MASH && shell_delegate_->GetShellConnector()) {
     prefs::ConnectToPrefService(
         shell_delegate_->GetShellConnector(),
         make_scoped_refptr(new PrefRegistrySimple()),
@@ -811,11 +813,11 @@ void Shell::Init(const ShellInitParams& init_params) {
     devtools_server_->AttachClient(std::move(devtools_client));
   }
 
-  if (is_mash)
+  if (config == Config::MASH)
     app_list_delegate_impl_ = base::MakeUnique<AppListDelegateImpl>();
 
   // TODO(sky): move creation to ShellPort.
-  if (!is_mash)
+  if (config != Config::MASH)
     immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>();
 
   scoped_overview_animation_settings_factory_.reset(
@@ -911,7 +913,7 @@ void Shell::Init(const ShellInitParams& init_params) {
   shell_port_->CreatePrimaryHost();
   root_window_for_new_windows_ = WmWindow::Get(GetPrimaryRootWindow());
 
-  if (!is_mash) {
+  if (config != Config::MASH) {
     resolution_notification_controller_.reset(
         new ResolutionNotificationController);
   }
@@ -957,7 +959,7 @@ void Shell::Init(const ShellInitParams& init_params) {
   toplevel_window_event_handler_ =
       base::MakeUnique<ToplevelWindowEventHandler>();
 
-  if (!is_mash) {
+  if (config != Config::MASH) {
     system_gesture_filter_.reset(new SystemGestureEventFilter);
     AddPreTargetHandler(system_gesture_filter_.get());
   }
@@ -976,7 +978,7 @@ void Shell::Init(const ShellInitParams& init_params) {
   AddShellObserver(lock_state_controller_.get());
 
   // The connector is unavailable in some tests.
-  if (is_mash && shell_delegate_->GetShellConnector()) {
+  if (config == Config::MASH && shell_delegate_->GetShellConnector()) {
     ui::mojom::UserActivityMonitorPtr user_activity_monitor;
     shell_delegate_->GetShellConnector()->BindInterface(ui::mojom::kServiceName,
                                                         &user_activity_monitor);
@@ -1040,7 +1042,7 @@ void Shell::Init(const ShellInitParams& init_params) {
   // WindowTreeHostManager::InitDisplays()
   // since AshTouchTransformController listens on
   // WindowTreeHostManager::Observer::OnDisplaysInitialized().
-  if (!is_mash) {
+  if (config != Config::MASH) {
     touch_transformer_controller_.reset(new AshTouchTransformController(
         display_configurator_.get(), display_manager_.get()));
   }
@@ -1051,7 +1053,7 @@ void Shell::Init(const ShellInitParams& init_params) {
 
   // Needs to be created after InitDisplays() since it may cause the virtual
   // keyboard to be deployed.
-  if (!is_mash)
+  if (config != Config::MASH)
     virtual_keyboard_controller_.reset(new VirtualKeyboardController);
 
   audio_a11y_controller_.reset(new chromeos::AudioA11yController);
@@ -1073,7 +1075,7 @@ void Shell::Init(const ShellInitParams& init_params) {
   video_activity_notifier_.reset(
       new VideoActivityNotifier(video_detector_.get()));
   bluetooth_notification_controller_.reset(new BluetoothNotificationController);
-  if (!is_mash) {
+  if (config != Config::MASH) {
     screen_orientation_controller_.reset(new ScreenOrientationController());
     screen_layout_observer_.reset(new ScreenLayoutObserver());
   }
@@ -1082,13 +1084,13 @@ void Shell::Init(const ShellInitParams& init_params) {
   // The compositor thread and main message loop have to be running in
   // order to create mirror window. Run it after the main message loop
   // is started.
-  if (!is_mash)
+  if (config != Config::MASH)
     display_manager_->CreateMirrorWindowAsyncIfAny();
 
   for (auto& observer : shell_observers_)
     observer.OnShellInitialized();
 
-  if (!is_mash)
+  if (config != Config::MASH)
     user_metrics_recorder_->OnShellInitialized();
 }
 
@@ -1220,7 +1222,7 @@ void Shell::SessionStateChanged(session_manager::SessionState state) {
   if (state == session_manager::SessionState::ACTIVE) {
     CreateShelfView();
 
-    if (!shell_port_->IsRunningInMash()) {
+    if (GetAshConfig() != Config::MASH) {
       // Recreate the keyboard after initial login and after multiprofile login.
       CreateKeyboard();
     }