Reland: Make popup notification active on being clicked

ui/message_center/views/toast_contents_view.cc

 // 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.
 
 #include "ui/message_center/views/toast_contents_view.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 26 matching lines @@
 
 // The width of a toast before animated reveal and after closing.
 const int kClosedToastWidth = 5;
 
 // FadeIn/Out look a bit better if they are slightly longer then default slide.
 const int kFadeInOutDuration = 200;
 
 }  // namespace.
 
 // static
+const char ToastContentsView::kViewClassName[] = "ToastContentsView";
+
+// static
 gfx::Size ToastContentsView::GetToastSizeForView(const views::View* view) {
   int width = kNotificationWidth + view->GetInsets().width();
   return gfx::Size(width, view->GetHeightForWidth(width));
 }
 
 ToastContentsView::ToastContentsView(
     const std::string& notification_id,
     PopupAlignmentDelegate* alignment_delegate,
     base::WeakPtr<MessagePopupCollection> collection)
     : collection_(collection),
@@ skipping 104 matching lines @@
   if (collection_)
     collection_->IncrementDeferCounter();
 
   if (bounds_animation_.get())
     bounds_animation_->Stop();
 
   bounds_animation_.reset(new gfx::SlideAnimation(this));
   bounds_animation_->Show();
 }
 
+void ToastContentsView::ActivateToast() {
+  set_can_activate(true);
+  if (GetWidget())
+    GetWidget()->Activate();
+}
+
 void ToastContentsView::StartFadeIn() {
   // The decrement is done in OnBoundsAnimationEndedOrCancelled callback.
   if (collection_)
     collection_->IncrementDeferCounter();
   fade_animation_->Stop();
 
   GetWidget()->SetOpacity(0);
   GetWidget()->ShowInactive();
   fade_animation_->Reset(0);
   fade_animation_->Show();
@@ skipping 127 matching lines @@
   }
   SetBoundsWithAnimation(bounds());
 }
 
 void ToastContentsView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   if (child_count() > 0)
     child_at(0)->GetAccessibleNodeData(node_data);
   node_data->role = ui::AX_ROLE_WINDOW;
 }
 
+const char* ToastContentsView::GetClassName() const {
+  return kViewClassName;
+}
+
 void ToastContentsView::ClickOnNotification(
     const std::string& notification_id) {
   if (collection_)
     collection_->ClickOnNotification(notification_id);
 }
 
 void ToastContentsView::ClickOnSettingsButton(
     const std::string& notification_id) {
   if (collection_)
     collection_->ClickOnSettingsButton(notification_id);
@@ skipping 61 matching lines @@
 }
 
 gfx::Rect ToastContentsView::GetClosedToastBounds(gfx::Rect bounds) {
   return gfx::Rect(bounds.x() + bounds.width() - kClosedToastWidth,
                    bounds.y(),
                    kClosedToastWidth,
                    bounds.height());
 }
 
 }  // namespace message_center