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

chrome/browser/ui/webui/options/browser_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/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 1687 matching lines @@
 }
 
 void BrowserOptionsHandler::HandleRefreshExtensionControlIndicators(
     const base::ListValue* args) {
   SetupExtensionControlledIndicators();
 }
 
 #if defined(OS_CHROMEOS)
 void BrowserOptionsHandler::HandleOpenWallpaperManager(
     const base::ListValue* args) {
+#if defined(USE_ASH)
   ash::Shell::GetInstance()->user_wallpaper_delegate()->OpenSetWallpaperPage();

[Evan Stade, 2014/10/31 18:27:12]

#else notimplemented? notreached?

[pkotwicz, 2014/10/31 19:07:58]

Added NOTIMPLEMENTED()

We will need to grep the codebase for USE_ATHENA ifdefs. Each ifdef is a bug. We
have added USE_ATHENA ifdefs in random places to make Chrome not crash.

I have changed all of the ifdefs in this CL to be !defined(USE_ATHENA) instead
of USE_ASH. Because we are still compiling Athena with Ash, using USE_ATHENA
instead of USE_ASH ifdefs "does something". When I make Athena no longer compile
Ash, I will write a CL to convert all of the USE_ATHENA ifdefs to USE_ASH

+#endif
 }
 
 void BrowserOptionsHandler::VirtualKeyboardChangeCallback(
     const base::ListValue* args) {
   bool enabled = false;
   args->GetBoolean(0, &enabled);
 
   chromeos::accessibility::EnableVirtualKeyboard(enabled);
 }
 
@@ skipping 266 matching lines @@
 
 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked,
                                                         bool disabled) {
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setMetricsReportingCheckboxState",
       base::FundamentalValue(checked),
       base::FundamentalValue(disabled));
 }
 
 }  // namespace options