ash: Remove aura dependencies from ash/system/web_notification

ash/system/web_notification/web_notification_tray.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 "ash/system/web_notification/web_notification_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/shelf/wm_shelf_util.h"
+#include "ash/common/wm/wm_lookup.h"
+#include "ash/common/wm/wm_root_window_controller.h"
+#include "ash/common/wm/wm_window.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_utils.h"
 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"
 #include "base/auto_reset.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "grit/ash_strings.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_tray_delegate.h"
 #include "ui/message_center/views/message_bubble_base.h"
 #include "ui/message_center/views/message_center_bubble.h"
 #include "ui/message_center/views/message_popup_collection.h"
@@ skipping 162 matching lines @@
   button_->set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON);
   tray_container()->AddChildView(button_);
   SetContentsBackground();
   tray_container()->SetBorder(views::Border::NullBorder());
   message_center_tray_.reset(new message_center::MessageCenterTray(
       this,
       message_center::MessageCenter::Get()));
   popup_alignment_delegate_.reset(new AshPopupAlignmentDelegate(
       status_area_widget->shelf_widget()->shelf_layout_manager()));
+  // TODO(jamescook): Either MessagePopupCollection needs to become aware of
+  // mus or we need some sort of parent/container provider.
   popup_collection_.reset(new message_center::MessagePopupCollection(
       ash::Shell::GetContainer(

[James Cook, 2016/06/02 18:01:29]

I'm not sure what to do about this. MessagePopupCollection needs to be able to
parent windows to a container, but it lives in ui/message_center/views.

[sky, 2016/06/02 18:15:59]

I'm not familiar enough with message_center to say. If this MessageCenter is
only used internal to ash, then making it know about mus sounds right.

[James Cook, 2016/06/02 19:42:19]

Unfortunately it is shared with desktop Chrome for showing notifications.
Desktop Chrome does not provide a parent container, since these are shown over
the desktop.  I might be able to do something like:

* Pass an integer container_id into here.
* Add a client interface somewhere in //ui/views that can convert a container_id
into a void* parent.
* Depending on whether or not mus is running, cast the void* parent to either an
aura::Window (and assign to Widget::InitParams::parent) or to a mus::Window (and
assign to Widget::InitParams::parent_mus).

But that seems pretty distasteful.

I'm going to leave it alone for now, unless you see an obvious solution.

           status_area_widget->GetNativeView()->GetRootWindow(),
           kShellWindowId_StatusContainer),
       message_center(),
       message_center_tray_.get(),
       popup_alignment_delegate_.get()));
-  const display::Display& display =
-      display::Screen::GetScreen()->GetDisplayNearestWindow(
-          status_area_widget->GetNativeView());
+  const display::Display& display = wm::WmLookup::Get()
+                                        ->GetWindowForWidget(status_area_widget)
+                                        ->GetDisplayNearestWindow();
   popup_alignment_delegate_->StartObserving(display::Screen::GetScreen(),
                                             display);
   OnMessageCenterTrayChanged();
 }
 
 WebNotificationTray::~WebNotificationTray() {
   // Release any child views that might have back pointers before ~View().
   message_center_bubble_.reset();
   popup_alignment_delegate_.reset();
   popup_collection_.reset();
 }
 
 // Public methods.
 
 bool WebNotificationTray::ShowMessageCenterInternal(bool show_settings) {
   if (!ShouldShowMessageCenter())
     return false;
 
   should_block_shelf_auto_hide_ = true;
   message_center::MessageCenterBubble* message_center_bubble =
       new message_center::MessageCenterBubble(
           message_center(),
           message_center_tray_.get(),
           true);
 
-  // Assume the status area and bubble bottoms are aligned when vertical.
-  aura::Window* status_area_window = status_area_widget()->GetNativeView();
-  const int max_height =
-      wm::IsHorizontalAlignment(GetShelfLayoutManager()->GetAlignment())
-          ? GetShelfLayoutManager()->GetIdealBounds().y()
-          : status_area_window->GetBoundsInRootWindow().bottom();
-
+  int max_height;
+  if (wm::IsHorizontalAlignment(GetShelfLayoutManager()->GetAlignment())) {
+    max_height = GetShelfLayoutManager()->GetIdealBounds().y();
+  } else {
+    // Assume the status area and bubble bottoms are aligned when vertical.
+    wm::WmWindow* status_area_window =
+        wm::WmLookup::Get()->GetWindowForWidget(status_area_widget());
+    gfx::Rect bounds_in_root =
+        status_area_window->GetRootWindow()->ConvertRectFromScreen(
+            status_area_window->GetBoundsInScreen());
+    max_height = bounds_in_root.bottom();
+  }
   message_center_bubble->SetMaxHeight(std::max(0, max_height - kTraySpacing));
   if (show_settings)
     message_center_bubble->SetSettingsVisible();
   message_center_bubble_.reset(
       new WebNotificationBubbleWrapper(this, message_center_bubble));
 
   status_area_widget()->SetHideSystemNotifications(true);
   GetShelfLayoutManager()->UpdateAutoHideState();
   button_->SetBubbleVisible(true);
   SetDrawBackgroundAsActive(true);
@@ skipping 240 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash