Revert of Add OnDisplayMetricsChanged in DisplayObserver.

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 "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 10 matching lines @@
 #include "ui/message_center/views/message_view.h"
 #include "ui/views/background.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_WIN) && defined(USE_ASH)
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #endif
 
-using gfx::Screen;
-
 namespace message_center {
 namespace {
 
 // 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.
@@ skipping 199 matching lines @@
 
 void ToastContentsView::OnDisplayChanged() {
   views::Widget* widget = GetWidget();
   if (!widget)
     return;
 
   gfx::NativeView native_view = widget->GetNativeView();
   if (!native_view || !collection_.get())
     return;
 
-  collection_->OnDisplayMetricsChanged(
-      Screen::GetScreenFor(native_view)->GetDisplayNearestWindow(native_view),
-      gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS |
-          gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA);
+  collection_->OnDisplayBoundsChanged(gfx::Screen::GetScreenFor(
+      native_view)->GetDisplayNearestWindow(native_view));
 }
 
 void ToastContentsView::OnWorkAreaChanged() {
   views::Widget* widget = GetWidget();
   if (!widget)
     return;
 
   gfx::NativeView native_view = widget->GetNativeView();
   if (!native_view || !collection_.get())
     return;
 
-  collection_->OnDisplayMetricsChanged(
-      Screen::GetScreenFor(native_view)->GetDisplayNearestWindow(native_view),
-      gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA);
+  collection_->OnDisplayBoundsChanged(gfx::Screen::GetScreenFor(
+      native_view)->GetDisplayNearestWindow(native_view));
 }
 
 // views::View
 void ToastContentsView::OnMouseEntered(const ui::MouseEvent& event) {
   if (collection_)
     collection_->OnMouseEntered(this);
 }
 
 void ToastContentsView::OnMouseExited(const ui::MouseEvent& event) {
   if (collection_)
@@ skipping 77 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