Experimental app list banner now appears on top of launcher pages.

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 "grit/ui_resources.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_switches.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/app_list/views/start_page_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/image_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)
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/views/bubble/bubble_window_targeter.h"
 #if defined(OS_WIN)
 #include "ui/base/win/shell.h"
@@ skipping 95 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(HideViewAnimationObserver);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListView:
 
 AppListView::AppListView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       app_list_main_view_(NULL),
       speech_view_(NULL),
+      experimental_banner_view_(NULL),
       overlay_view_(NULL),
       animation_observer_(new HideViewAnimationObserver()) {
   CHECK(delegate);
 
   delegate_->AddObserver(this);
   delegate_->GetSpeechUI()->AddObserver(this);
 }
 
 AppListView::~AppListView() {
   delegate_->GetSpeechUI()->RemoveObserver(this);
@@ skipping 142 matching lines @@
   // Speech recognition is available only when the start page exists.
   if (delegate_ && delegate_->IsSpeechRecognitionEnabled()) {
     speech_view_ = new SpeechView(delegate_.get());
     speech_view_->SetVisible(false);
     speech_view_->SetPaintToLayer(true);
     speech_view_->SetFillsBoundsOpaquely(false);
     speech_view_->layer()->SetOpacity(0.0f);
     AddChildView(speech_view_);
   }
 
+  if (app_list::switches::IsExperimentalAppListEnabled()) {
+    // Draw a banner in the corner of the experimental app list.
+    experimental_banner_view_ = new views::ImageView;
+    const gfx::ImageSkia& experimental_icon =
+        *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+            IDR_APP_LIST_EXPERIMENTAL_ICON);
+    experimental_banner_view_->SetImage(experimental_icon);
+    experimental_banner_view_->SetPaintToLayer(true);
+    experimental_banner_view_->SetFillsBoundsOpaquely(false);
+    AddChildView(experimental_banner_view_);
+  }
+
   OnProfilesChanged();
   set_color(kContentsBackgroundColor);
   set_margins(gfx::Insets());
   set_parent_window(parent);
   set_close_on_deactivate(false);
   set_close_on_esc(false);
   set_anchor_view_insets(gfx::Insets(kArrowOffset + anchor_offset.y(),
                                      kArrowOffset + anchor_offset.x(),
                                      kArrowOffset - anchor_offset.y(),
                                      kArrowOffset - anchor_offset.x()));
@@ skipping 127 matching lines @@
 
   if (speech_view_) {
     gfx::Rect speech_bounds = contents_bounds;
     int preferred_height = speech_view_->GetPreferredSize().height();
     speech_bounds.Inset(kSpeechUIMargin, kSpeechUIMargin);
     speech_bounds.set_height(std::min(speech_bounds.height(),
                                       preferred_height));
     speech_bounds.Inset(-speech_view_->GetInsets());
     speech_view_->SetBoundsRect(speech_bounds);
   }
+
+  if (experimental_banner_view_) {
+    // Position the experimental banner in the lower right corner.
+    gfx::Rect image_bounds = experimental_banner_view_->GetImageBounds();
+    experimental_banner_view_->SetBoundsRect(image_bounds);
+    experimental_banner_view_->SetPosition(
+        gfx::Point(contents_bounds.width() - image_bounds.width(),
+                   contents_bounds.height() - image_bounds.height()));

[calamity, 2014/07/15 08:57:58]

You can avoid making two calls here.

image_bounds.set_origin(
    gfx::Point(contents_bounds.width() - image_bounds.width(),
               contents_bounds.height() - image_bounds.height());
experimental_banner_view_->SetBoundsRect(image_bounds);

[Matt Giuca, 2014/07/16 00:18:07]

Done.

+  }
 }
 
 void AppListView::SchedulePaintInRect(const gfx::Rect& rect) {
   BubbleDelegateView::SchedulePaintInRect(rect);
   if (GetBubbleFrameView())
     GetBubbleFrameView()->SchedulePaint();
 }
 
 void AppListView::OnWidgetDestroying(views::Widget* widget) {
   BubbleDelegateView::OnWidgetDestroying(widget);
@@ skipping 68 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