mash: Fix Chrome crash accessing chrome://settings.

chrome/browser/ui/webui/options/chromeos/display_options_handler.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 "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 
 #include "ash/common/strings/grit/ash_strings.h"
 #include "ash/display/display_configuration_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
+#include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/manager/display_layout_builder.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 148 matching lines @@
   result->SetInteger("left", bounds.x());
   result->SetInteger("top", bounds.y());
   result->SetInteger("width", bounds.width());
   result->SetInteger("height", bounds.height());
   return result;
 }
 
 }  // namespace
 
 DisplayOptionsHandler::DisplayOptionsHandler() {
-  // ash::Shell doesn't exist in Athena.
-  // See: http://crbug.com/416961
-  ash::Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
+  // TODO(mash) Support Chrome display settings in Mash. crbug.com/548429
+  if (!chrome::IsRunningInMash())
+    ash::Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
 }
 
 DisplayOptionsHandler::~DisplayOptionsHandler() {
-  // ash::Shell doesn't exist in Athena.
-  ash::Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
+  // TODO(mash) Support Chrome display settings in Mash. crbug.com/548429
+  if (!chrome::IsRunningInMash())
+    ash::Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
 }
 
 void DisplayOptionsHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   RegisterTitle(localized_strings, "displayOptionsPage",
                 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_TAB_TITLE);
 
   localized_strings->SetString(
       "selectedDisplayTitleOptions", l10n_util::GetStringUTF16(
@@ skipping 154 matching lines @@
     }
 
     js_displays->Append(js_display);
   }
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.DisplayOptions.setDisplayInfo", mode, *js_displays);
 }
 
 void DisplayOptionsHandler::UpdateDisplaySettingsEnabled() {
+  // TODO(mash) Support Chrome display settings in Mash. crbug.com/548429
+  if (chrome::IsRunningInMash())
+    return;
+
   ash::DisplayManager* display_manager = GetDisplayManager();
   bool disable_multi_display_layout =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kDisableMultiDisplayLayout);
   bool ui_enabled = display_manager->num_connected_displays() <= 2 ||
                     !disable_multi_display_layout;
   bool unified_enabled = display_manager->unified_desktop_enabled();
   bool mirrored_enabled = display_manager->num_connected_displays() == 2;
 
   web_ui()->CallJavascriptFunctionUnsafe(
@@ skipping 184 matching lines @@
   bool enable = false;
   if (!args->GetBoolean(0, &enable))
     NOTREACHED();
 
   GetDisplayManager()->SetDefaultMultiDisplayModeForCurrentDisplays(
       enable ? ash::DisplayManager::UNIFIED : ash::DisplayManager::EXTENDED);
 }
 
 }  // namespace options
 }  // namespace chromeos