Make the kiosk code not depend on Ash in Athena

chrome/browser/chromeos/ui/kiosk_external_update_notification.cc

 // Copyright 2014 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/chromeos/ui/kiosk_external_update_notification.h"
 
-#include "ash/shell.h"
-#include "ash/shell_window_ids.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
+#if defined(USE_ASH)
+#include "ash/shell.h"
+#include "ash/shell_window_ids.h"
+#endif
+
 namespace chromeos {
 
 namespace {
 
 const SkColor kTextColor = SK_ColorBLACK;
 const SkColor kWindowBackgroundColor = SK_ColorWHITE;
 const int kWindowCornerRadius = 4;
 const int kPreferredWidth = 600;
 const int kPreferredHeight = 250;
 
@@ skipping 83 matching lines @@
     const base::string16& message) {
   if (view_)
     view_->SetMessage(message);
 }
 
 void KioskExternalUpdateNotification::CreateAndShowNotificationView(
     const base::string16& message) {
   view_ = new KioskExternalUpdateNotificationView(this);
   view_->SetMessage(message);
 
+  gfx::Size rs;

[Jun Mukai, 2014/10/29 01:03:27]

how about CHECK(ash::Shell::HasInstance()) ?

+  aura::Window* parent = NULL;
+#if defined(USE_ASH)
   aura::Window* root_window = ash::Shell::GetTargetRootWindow();
-  gfx::Size rs = root_window->bounds().size();
+  rs = root_window->bounds().size();
+  parent = ash::Shell::GetContainer(root_window,
+                                    ash::kShellWindowId_SettingBubbleContainer);
+#else
+  NOTREACHED();
+#endif
+
   gfx::Size ps = view_->GetPreferredSize();
   gfx::Rect bounds((rs.width() - ps.width()) / 2,
                    (rs.height() - ps.height()) / 10,
                    ps.width(),
                    ps.height());
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_POPUP;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.ownership = views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET;
   params.accept_events = false;
   params.keep_on_top = true;
   params.remove_standard_frame = true;
   params.delegate = view_;
   params.bounds = bounds;
-  params.parent = ash::Shell::GetContainer(
-      root_window, ash::kShellWindowId_SettingBubbleContainer);
+  params.parent = parent;
   views::Widget* widget = new views::Widget;
   widget->Init(params);
   widget->SetContentsView(view_);
   gfx::NativeView native_view = widget->GetNativeView();
   native_view->SetName("KioskExternalUpdateNotification");
   widget->Show();
 }
 
 void KioskExternalUpdateNotification::Dismiss() {
   if (view_) {
     KioskExternalUpdateNotificationView* view = view_;
     view_ = NULL;
     view->CloseByOwner();
   }
 }
 
 }  // namespace chromeos