mash: Convert WebNotificationTray to wm common types

ui/message_center/views/message_popup_collection.h

 // Copyright (c) 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.
 
 #ifndef UI_MESSAGE_CENTER_VIEWS_MESSAGE_POPUP_COLLECTION_H_
 #define UI_MESSAGE_CENTER_VIEWS_MESSAGE_POPUP_COLLECTION_H_
 
 #include <stddef.h>
 
 #include <list>
 #include <map>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/native_widget_types.h"
 #include "ui/message_center/message_center_export.h"
 #include "ui/message_center/message_center_observer.h"
 #include "ui/message_center/views/message_center_controller.h"
 #include "ui/message_center/views/toast_contents_view.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace base {
 class RunLoop;
 }
 
@@ skipping 17 matching lines @@
 
 // Container for popup toasts. Because each toast is a frameless window rather
 // than a view in a bubble, now the container just manages all of those toasts.
 // This is similar to chrome/browser/notifications/balloon_collection, but the
 // contents of each toast are for the message center and layout strategy would
 // be slightly different.
 class MESSAGE_CENTER_EXPORT MessagePopupCollection
     : public MessageCenterController,
       public MessageCenterObserver {
  public:
-  // |parent| specifies the parent widget of the toast windows. The default
-  // parent will be used for NULL. Usually each icon is spacing against its
-  // predecessor.
-  MessagePopupCollection(gfx::NativeView parent,
-                         MessageCenter* message_center,
+  MessagePopupCollection(MessageCenter* message_center,
                          MessageCenterTray* tray,
                          PopupAlignmentDelegate* alignment_delegate);
   ~MessagePopupCollection() override;
 
   // Overridden from MessageCenterController:
   void ClickOnNotification(const std::string& notification_id) override;
   void RemoveNotification(const std::string& notification_id,
                           bool by_user) override;
   std::unique_ptr<ui::MenuModel> CreateMenuModel(
       const NotifierId& notifier_id,
@@ skipping 22 matching lines @@
   // zero. Otherwise, simply waits when it becomes zero.
   void DoUpdateIfPossible();
 
   // Removes the toast from our internal list of toasts; this is called when the
   // toast is irrevocably closed (such as within RemoveToast).
   void ForgetToast(ToastContentsView* toast);
 
   // Called when the display bounds has been changed. Used in Windows only.
   void OnDisplayMetricsChanged(const display::Display& display);
 
-  // Used by ToastContentsView to locate itself.
-  gfx::NativeView parent() const { return parent_; }
-
  private:
   friend class test::MessagePopupCollectionTest;
   typedef std::list<ToastContentsView*> Toasts;
 
   // Iterates toasts and starts closing them.
   std::set<std::string> CloseAllWidgets();
 
   // Called by ToastContentsView when its window is closed.
   void RemoveToast(ToastContentsView* toast, bool mark_as_shown);
 
@@ skipping 26 matching lines @@
   // done. This method is run when defer counter is zero, may initiate next
   // update/animation step.
   void OnDeferTimerExpired();
 
   // "ForTest" methods.
   views::Widget* GetWidgetForTest(const std::string& id) const;
   void CreateRunLoopForTest();
   void WaitForTest();
   gfx::Rect GetToastRectAt(size_t index) const;
 
-  gfx::NativeView parent_;
   MessageCenter* message_center_;
   MessageCenterTray* tray_;
   Toasts toasts_;
 
   PopupAlignmentDelegate* alignment_delegate_;
 
   int defer_counter_;
 
   // This is only used to compare with incoming events, do not assume that
   // the toast will be valid if this pointer is non-NULL.
@@ skipping 18 matching lines @@
   // Gives out weak pointers to toast contents views which have an unrelated
   // lifetime.  Must remain the last member variable.
   base::WeakPtrFactory<MessagePopupCollection> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePopupCollection);
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_VIEWS_MESSAGE_POPUP_COLLECTION_H_