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_ATHENA)
   ash::Shell::GetInstance()->user_wallpaper_delegate()->OpenSetWallpaperPage();
+#else
+  NOTIMPLEMENTED();
+#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