Make the App Info Dialog appear modal

ui/app_list/views/app_list_view.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 "ui/app_list/views/app_list_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
@@ skipping 10 matching lines @@
 #include "ui/app_list/views/app_list_view_observer.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/signin_view.h"
 #include "ui/app_list/views/speech_view.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/bubble/bubble_window_targeter.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 32 matching lines @@
           switches::kDisableDwmComposition)) {
     return false;
   }
 #elif defined(OS_LINUX) && !defined(USE_ASH)
   // Shadows are not supported on (non-ChromeOS) Linux.
   return false;
 #endif
   return true;
 }
 
+// An background for a view that appears as a colored rounded rectangle with the
+// given radius and the same size as the target view.
+class ColoredRoundRectBackground : public views::Background {
+ public:
+  ColoredRoundRectBackground(int corner_radius, SkColor color)
+      : corner_radius_(corner_radius), color_(color) {};
+  virtual ~ColoredRoundRectBackground() {};
+
+  virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {
+    SkPaint paint;
+    paint.setStyle(SkPaint::kFill_Style);
+    paint.setColor(color_);
+    canvas->DrawRoundRect(view->GetContentsBounds(), corner_radius_, paint);
+  }
+
+ private:
+  const int corner_radius_;
+  const SkColor color_;
+};
+
 }  // namespace
 
 // An animation observer to hide the view at the end of the animation.
 class HideViewAnimationObserver : public ui::ImplicitAnimationObserver {
  public:
   HideViewAnimationObserver()
       : frame_(NULL),
         target_(NULL) {
   }
 
@@ skipping 29 matching lines @@
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListView:
 
 AppListView::AppListView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       app_list_main_view_(NULL),
       signin_view_(NULL),
       speech_view_(NULL),
+      overlay_view_(NULL),
       animation_observer_(new HideViewAnimationObserver()) {
   CHECK(delegate);
 
   delegate_->AddObserver(this);
   delegate_->GetSpeechUI()->AddObserver(this);
 }
 
 AppListView::~AppListView() {
   delegate_->GetSpeechUI()->RemoveObserver(this);
   delegate_->RemoveObserver(this);
@@ skipping 47 matching lines @@
 
 void AppListView::Close() {
   app_list_main_view_->Close();
   delegate_->Dismiss();
 }
 
 void AppListView::UpdateBounds() {
   SizeToContents();
 }
 
+void AppListView::ShowAppListOverlay(bool visible) {
+  if (overlay_view_ == NULL) {

[calamity, 2014/05/16 05:54:32]

Any reason not to just construct this in the initializer list?

[sashab, 2014/05/19 07:24:53]

Originally I thought it would be a memory leak - if the overlay is never
displayed it is created but not 'attached' to the view hierarchy. This is no
longer true. Done.

[calamity, 2014/05/20 01:25:17]

Actually, you're right. Better to DCHECK overlay_view_ here and instantiate it
where you add it, in InitAsBubbleInternal(). This follows what speech_view_ and
app_list_main_view_ do.

+    // The contents corner radius is 1px smaller than border corner radius.
+    const int kOverlayCornerRadius =
+        GetBubbleFrameView()->bubble_border()->GetBorderCornerRadius() - 1;

[calamity, 2014/05/16 05:54:32]

Good news! Since this is a view inside the bubble now, it's not necessary to
draw with a rounded corner because the view will clip to the bubble border.

[sashab, 2014/05/19 07:24:53]

Cool!!!

+    const float kOverlayOpacity = 0.75f;
+
+    // To make the overlay view, construct a regular view with
+    // ColoredRoundRectBackground as the background. This is because we need
+    // overlay_view_ to be drawn to its own layer (so it appears correctly in
+    // the foreground), but we also need a custom Paint() method to draw our
+    // custom rounded rectangle (View::Paint() is not called when
+    // SetPaintToLayer is true).
+    overlay_view_ = new views::View();
+    overlay_view_->SetPaintToLayer(true);
+    overlay_view_->set_background(
+        new ColoredRoundRectBackground(kOverlayCornerRadius, SK_ColorWHITE));

[calamity, 2014/05/16 05:54:32]

That means you can get away with
views::Background::CreateSolidBackground(SK_ColorWHITE).

[sashab, 2014/05/19 07:24:53]

Nice!! Done.

+    overlay_view_->layer()->SetOpacity(kOverlayOpacity);
+    overlay_view_->SetBoundsRect(bounds());
+
+    // Add this view to the 'front' of the screen (end of the child view list).
+    AddChildViewAt(overlay_view_, this->child_count());

[calamity, 2014/05/16 05:54:32]

This is equivalent to AddChildView().

[sashab, 2014/05/19 07:24:53]

So it is. Thanks.

+  }
+  overlay_view_->SetVisible(visible);
+}
+
 bool AppListView::ShouldCenterWindow() const {
   return delegate_->ShouldCenterWindow();
 }
 
 gfx::Size AppListView::GetPreferredSize() {
   return app_list_main_view_->GetPreferredSize();
 }
 
 void AppListView::Paint(gfx::Canvas* canvas) {
   views::BubbleDelegateView::Paint(canvas);
@@ skipping 304 matching lines @@
 #else
   speech_view_->SetVisible(recognizing);
   app_list_main_view_->SetVisible(!recognizing);
 
   // Needs to schedule paint of AppListView itself, to repaint the background.
   GetBubbleFrameView()->SchedulePaint();
 #endif
 }
 
 }  // namespace app_list