Excludes settings which uses Ash from Athena.

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 <string>
 
 #include "ash/display/display_configurator_animation.h"
 #include "ash/display/display_controller.h"
@@ skipping 127 matching lines @@
   result->SetBoolean("isNative", mode.native);
   result->SetBoolean(
       "selected", mode.IsEquivalent(
           GetDisplayManager()->GetActiveModeForDisplayId(display_id)));
   return result;
 }
 
 }  // namespace
 
 DisplayOptionsHandler::DisplayOptionsHandler() {
-  ash::Shell::GetInstance()->display_controller()->AddObserver(this);
+  // ash::Shell doesn't exist in Athena.
+  // See: http://crbug.com/416961
+  if (ash::Shell::HasInstance())

[oshima, 2014/09/23 20:48:21]

can you use ifdef USE_ATHENA?

[Jun Mukai, 2014/09/23 20:52:38]

Done.

+    ash::Shell::GetInstance()->display_controller()->AddObserver(this);
 }
 
 DisplayOptionsHandler::~DisplayOptionsHandler() {
-  ash::Shell::GetInstance()->display_controller()->RemoveObserver(this);
+  // ash::Shell doesn't exist in Athena.
+  if (ash::Shell::HasInstance())
+    ash::Shell::GetInstance()->display_controller()->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 31 matching lines @@
   localized_strings->SetString(
       "startCalibratingOverscan", l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_START_CALIBRATING_OVERSCAN));
   localized_strings->SetString(
       "selectedDisplayColorProfile", l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE));
 }
 
 void DisplayOptionsHandler::InitializePage() {
   DCHECK(web_ui());
+  web_ui()->CallJavascriptFunction(
+      "options.BrowserOptions.enableDisplayButton",
+      base::FundamentalValue(ash::Shell::HasInstance()));

[oshima, 2014/09/23 20:48:21]

ditto

[Jun Mukai, 2014/09/23 20:52:38]

Done.

 }
 
 void DisplayOptionsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "getDisplayInfo",
       base::Bind(&DisplayOptionsHandler::HandleDisplayInfo,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "setMirroring",
       base::Bind(&DisplayOptionsHandler::HandleMirroring,
@@ skipping 241 matching lines @@
     return;
   }
 
   GetDisplayManager()->SetColorCalibrationProfile(
       display_id, static_cast<ui::ColorCalibrationProfile>(profile_id));
   SendAllDisplayInfo();
 }
 
 }  // namespace options
 }  // namespace chromeos