Make chrome/browser/ui/webui not depend on ash when using Athena

chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

Index: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
index 0cc3198d5e09e45e9676592046607c2489442717..9d7f600ec73c4a45ad8d350696346ed7241c9933 100644
--- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
@@ -145,18 +145,14 @@ base::DictionaryValue* ConvertDisplayModeToValue(int64 display_id,
 }  // namespace
 
 DisplayOptionsHandler::DisplayOptionsHandler() {
-#if !defined(USE_ATHENA)
   // ash::Shell doesn't exist in Athena.
   // See: http://crbug.com/416961
   ash::Shell::GetInstance()->display_controller()->AddObserver(this);
-#endif
 }
 
 DisplayOptionsHandler::~DisplayOptionsHandler() {
-#if !defined(USE_ATHENA)
   // ash::Shell doesn't exist in Athena.
   ash::Shell::GetInstance()->display_controller()->RemoveObserver(this);
-#endif
 }
 
 void DisplayOptionsHandler::GetLocalizedValues(
@@ -208,11 +204,9 @@ void DisplayOptionsHandler::GetLocalizedValues(
 
 void DisplayOptionsHandler::InitializePage() {
   DCHECK(web_ui());
-#if !defined(USE_ATHENA)
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.enableDisplayButton",
       base::FundamentalValue(true));
-#endif
 }
 
 void DisplayOptionsHandler::RegisterMessages() {