Add new DialogDelegate for dialogs in the App List

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"
 #include "base/win/windows_version.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/speech_ui_model.h"
 #include "ui/app_list/views/app_list_background.h"
 #include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #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/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/controls/textfield/textfield.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
@@ skipping 30 matching lines @@
           switches::kDisableDwmComposition)) {
     return false;
   }
 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // Shadows are not supported on (non-ChromeOS) Linux.
   return false;
 #endif
   return true;
 }
 
-// The background for the App List overlay, which appears as a white rounded
-// rectangle with the given radius and the same size as the target view.
-class AppListOverlayBackground : public views::Background {
- public:
-  AppListOverlayBackground(int corner_radius)
-      : corner_radius_(corner_radius) {};
-  virtual ~AppListOverlayBackground() {};
-
-  // Overridden from views::Background:
-  virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {
-    SkPaint paint;
-    paint.setStyle(SkPaint::kFill_Style);
-    paint.setColor(SK_ColorWHITE);
-    canvas->DrawRoundRect(view->GetContentsBounds(), corner_radius_, paint);
-  }
-
- private:
-  const int corner_radius_;
-
-  DISALLOW_COPY_AND_ASSIGN(AppListOverlayBackground);
-};
-
 }  // 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 28 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(HideViewAnimationObserver);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListView:
 
 AppListView::AppListView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       app_list_main_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::SetAppListOverlayVisible(bool visible) {
-  DCHECK(overlay_view_);
-  overlay_view_->SetVisible(visible);
-}
-
 bool AppListView::ShouldCenterWindow() const {
   return delegate_->ShouldCenterWindow();
 }
 
 gfx::Size AppListView::GetPreferredSize() const {
   return app_list_main_view_->GetPreferredSize();
 }
 
 void AppListView::Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) {
   views::BubbleDelegateView::Paint(canvas, cull_set);
@@ skipping 107 matching lines @@
       app_list_main_view_));
 
   // On non-aura the bubble has two widgets, and it's possible for the border
   // to be shown independently in odd situations. Explicitly hide the bubble
   // widget to ensure that any WM_WINDOWPOSCHANGED messages triggered by the
   // window manager do not have the SWP_SHOWWINDOW flag set which would cause
   // the border to be shown. See http://crbug.com/231687 .
   GetWidget()->Hide();
 #endif
 
-  // To make the overlay view, construct a view with a white background, rather
-  // than a white rectangle in it. This is because we need overlay_view_ to be
-  // drawn to its own layer (so it appears correctly in the foreground).
-  const float kOverlayOpacity = 0.75f;
-  overlay_view_ = new views::View();
-  overlay_view_->SetPaintToLayer(true);
-  overlay_view_->layer()->SetOpacity(kOverlayOpacity);
-  overlay_view_->SetBoundsRect(GetContentsBounds());
-  overlay_view_->SetVisible(false);
-
-  // On platforms that don't support a shadow, the rounded border of the app
-  // list is constructed _inside_ the view, so a rectangular background goes
-  // over the border in the rounded corners. To fix this, give the background a
-  // corner radius 1px smaller than the outer border, so it just reaches but
-  // doesn't cover it.
-  const int kOverlayCornerRadius =
-      GetBubbleFrameView()->bubble_border()->GetBorderCornerRadius();
-  overlay_view_->set_background(new AppListOverlayBackground(
-      kOverlayCornerRadius - (SupportsShadow() ? 0 : 1)));
-
-  AddChildView(overlay_view_);
-
   if (delegate_)
     delegate_->ViewInitialized();
 }
 
 void AppListView::OnBeforeBubbleWidgetInit(
     views::Widget::InitParams* params,
     views::Widget* widget) const {
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
   if (delegate_ && delegate_->ForceNativeDesktop())
     params->native_widget = new views::DesktopNativeWidgetAura(widget);
@@ skipping 152 matching lines @@
       speech_view_->layer()->SetTransform(speech_transform);
   }
 
   if (will_appear)
     speech_view_->SetVisible(true);
   else
     app_list_main_view_->SetVisible(true);
 }
 
 }  // namespace app_list