Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / views / app_list_background.cc

diff --git a/src/ui/app_list/views/app_list_background.cc b/src/ui/app_list/views/app_list_background.cc
index 19085e6..b3a3ea3 100644 (file)
--- a/src/ui/app_list/views/app_list_background.cc
+++ b/src/ui/app_list/views/app_list_background.cc
@@ -5,7 +5,6 @@
 #include "ui/app_list/views/app_list_background.h"
 
 #include "base/command_line.h"
-#include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/app_list/app_list_constants.h"
@@ -13,7 +12,6 @@
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_util.h"
@@ -88,7 +86,10 @@ void AppListBackground::Paint(gfx::Canvas* canvas,
       const gfx::Rect contents_view_view_bounds =
           contents_view->ConvertRectToWidget(contents_view->GetLocalBounds());
       gfx::Rect separator_rect(contents_rect);
-      separator_rect.set_y(contents_view_view_bounds.bottom());
+      // Extra kContentsSwitcherSeparatorHeight pixels so the launcher page
+      // indicator overlays the separator rect.
+      separator_rect.set_y(contents_view_view_bounds.bottom() +
+                           kContentsSwitcherSeparatorHeight);
       separator_rect.set_height(kBottomSeparatorSize);
       canvas->FillRect(separator_rect, kBottomSeparatorColor);
       int contents_switcher_top = separator_rect.bottom();
@@ -99,15 +100,6 @@ void AppListBackground::Paint(gfx::Canvas* canvas,
       paint.setColor(kContentsSwitcherBackgroundColor);
       canvas->DrawRect(contents_switcher_rect, paint);
     }
-
-    // Draw a banner in the corner of the app list if it is the experimental app
-    // list.
-    const gfx::ImageSkia& experimental_icon =
-        *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-             IDR_APP_LIST_EXPERIMENTAL_ICON);
-    canvas->DrawImageInt(experimental_icon,
-                         contents_rect.right() - experimental_icon.width(),
-                         contents_rect.bottom() - experimental_icon.height());
   }
 
   canvas->Restore();