arc: Scale notification surface to fit

ui/arc/notification/arc_custom_notification_view.cc

 // Copyright 2016 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/arc/notification/arc_custom_notification_view.h"
 
 #include "components/exo/notification_surface.h"
 #include "components/exo/surface.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/message_center/message_center_style.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/widget/widget.h"
 
 namespace arc {
 
 ArcCustomNotificationView::ArcCustomNotificationView(
@@ skipping 51 matching lines @@
   if (widget && native_view() &&
       views::Widget::GetTopLevelWidgetForNativeView(native_view()) != widget) {
     return;
   }
 
   views::NativeViewHost::ViewHierarchyChanged(details);
 
   if (!widget || !surface_ || !details.is_add)
     return;
 
-  SetPreferredSize(surface_->GetSize());
+  gfx::Size preferred_size = surface_->GetSize();
+  float scale = 1.0f;
+  if (preferred_size.width() != message_center::kNotificationWidth) {
+    scale = static_cast<float>(message_center::kNotificationWidth) /
+            preferred_size.width();
+    preferred_size.SetSize(message_center::kNotificationWidth,
+                           preferred_size.height() * scale);
+  }
+
+  SetPreferredSize(preferred_size);
   Attach(surface_->window());
 }
 
 void ArcCustomNotificationView::Layout() {
   views::NativeViewHost::Layout();
 
+  if (surface_) {
+    // Scale notification surface if necessary.
+    gfx::Transform transform;
+    const gfx::Size surface_size = surface_->GetSize();
+    const gfx::Size contents_size = GetContentsBounds().size();
+    if (!surface_size.IsEmpty() && !contents_size.IsEmpty() &&
+        surface_size != contents_size) {

[reveman, 2016/07/28 18:50:53]

nit: "surface_size != contents_size" check is not needed

[xiyuan, 2016/07/28 19:32:51]

Done.

+      transform.Scale(
+          static_cast<float>(contents_size.width()) / surface_size.width(),
+          static_cast<float>(contents_size.height()) / surface_size.height());
+    }
+    surface_->window()->SetTransform(transform);
+  }
+
   if (!floating_close_button_widget_ || !surface_ || !GetWidget())
     return;
 
-  gfx::Rect surface_local_bounds(surface_->window()->bounds().size());
+  gfx::Rect surface_local_bounds(surface_->GetSize());
   gfx::Rect close_button_bounds(floating_close_button_->GetPreferredSize());
   close_button_bounds.set_x(surface_local_bounds.right() -
                             close_button_bounds.width());
   close_button_bounds.set_y(surface_local_bounds.y());
   floating_close_button_widget_->SetBounds(close_button_bounds);
 }
 
 void ArcCustomNotificationView::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
   if (item_ && !item_->pinned() && sender == floating_close_button_) {
@@ skipping 16 matching lines @@
   } else if (!item_->pinned() && !floating_close_button_widget_) {
     CreateFloatingCloseButton();
   }
 }
 
 void ArcCustomNotificationView::OnItemNotificationSurfaceRemoved() {
   surface_ = nullptr;
 }
 
 }  // namespace arc