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

chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc

 // Copyright 2013 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/chromeos/first_run/first_run_ui.h"
 
-#include "ash/shell.h"
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "grit/browser_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 
+#if defined(USE_ASH)

[oshima, 2014/10/30 18:08:41]

First run impl for athena will be completely different.
Is it hard to exclude this first run ui on athena?

[pkotwicz, 2014/10/30 21:31:41]

Done.

+#include "ash/shell.h"
+#endif
+
 namespace {
 
 const char kFirstRunJSPath[] = "first_run.js";
+
+#if defined(USE_ASH)
 const char kShelfAlignmentBottom[] = "bottom";
 const char kShelfAlignmentLeft[] = "left";
 const char kShelfAlignmentRight[] = "right";
+#endif
 
 void SetLocalizedStrings(base::DictionaryValue* localized_strings) {
   localized_strings->SetString(
       "appListHeader",
       l10n_util::GetStringUTF16(IDS_FIRST_RUN_APP_LIST_STEP_HEADER));
   localized_strings->SetString(
       "appListText1",
       l10n_util::GetStringUTF16(IDS_FIRST_RUN_APP_LIST_STEP_TEXT_1));
   localized_strings->SetString(
       "appListText2",
@@ skipping 16 matching lines @@
       l10n_util::GetStringUTF16(IDS_FIRST_RUN_HELP_STEP_KEEP_EXPLORING_BUTTON));
   localized_strings->SetString(
       "helpFinishButton",
       l10n_util::GetStringUTF16(IDS_FIRST_RUN_HELP_STEP_FINISH_BUTTON));
   localized_strings->SetString(
       "nextButton", l10n_util::GetStringUTF16(IDS_FIRST_RUN_NEXT_BUTTON));
   localized_strings->SetBoolean(
       "transitionsEnabled",
       CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kEnableFirstRunUITransitions));
+#if defined(USE_ASH)
   std::string shelf_alignment;
   ash::Shell* shell = ash::Shell::GetInstance();
   switch (shell->GetShelfAlignment(shell->GetPrimaryRootWindow())) {
     case ash::SHELF_ALIGNMENT_BOTTOM:
       shelf_alignment = kShelfAlignmentBottom;
       break;
     case ash::SHELF_ALIGNMENT_LEFT:
       shelf_alignment = kShelfAlignmentLeft;
       break;
     case ash::SHELF_ALIGNMENT_RIGHT:
       shelf_alignment = kShelfAlignmentRight;
       break;
     default:
       NOTREACHED() << "Unsupported shelf alignment";
   }
   localized_strings->SetString("shelfAlignment", shelf_alignment);
+#endif
 }
 
 content::WebUIDataSource* CreateDataSource() {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIFirstRunHost);
   source->SetJsonPath("strings.js");
   source->SetDefaultResource(IDR_FIRST_RUN_HTML);
   source->AddResourcePath(kFirstRunJSPath, IDR_FIRST_RUN_JS);
   base::DictionaryValue localized_strings;
   webui::SetFontAndTextDirection(&localized_strings);
@@ skipping 10 matching lines @@
     : WebUIController(web_ui),
       actor_(NULL) {
   FirstRunHandler* handler = new FirstRunHandler();
   actor_ = handler;
   web_ui->AddMessageHandler(handler);
   content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), CreateDataSource());
 }
 
 }  // namespace chromeos