Upstream version 10.39.225.0

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

diff --git a/src/ui/app_list/views/start_page_view.cc b/src/ui/app_list/views/start_page_view.cc
index d9d41d2..23d2f64 100644 (file)
--- a/src/ui/app_list/views/start_page_view.cc
+++ b/src/ui/app_list/views/start_page_view.cc
@@ -27,64 +27,36 @@ namespace app_list {
 namespace {
 
 // Layout constants.
-const int kTopMargin = 30;
-const int kInstantContainerSpacing = 20;
+const int kTopMargin = 84;
+const int kInstantContainerSpacing = 11;
+const int kSearchBoxAndTilesSpacing = 40;
 
 // WebView constants.
 const int kWebViewWidth = 500;
 const int kWebViewHeight = 105;
 
 // DummySearchBoxView constants.
-const int kDummySearchBoxWidth = 490;
-const int kDummySearchBoxHeight = 40;
-const int kDummySearchBoxBorderWidth = 1;
-const int kDummySearchBoxBorderBottomWidth = 2;
-const int kDummySearchBoxBorderCornerRadius = 2;
+const int kDummySearchBoxWidth = 480;
 
 // Tile container constants.
 const size_t kNumStartPageTiles = 5;
 const int kTileSpacing = 10;
 
-// A background that paints a solid white rounded rect with a thin grey border.
-class DummySearchBoxBackground : public views::Background {
- public:
-  DummySearchBoxBackground() {}
-  virtual ~DummySearchBoxBackground() {}
-
- private:
-  // views::Background overrides:
-  virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {
-    gfx::Rect bounds = view->GetContentsBounds();
-
-    SkPaint paint;
-    paint.setFlags(SkPaint::kAntiAlias_Flag);
-    paint.setColor(kStartPageBorderColor);
-    canvas->DrawRoundRect(bounds, kDummySearchBoxBorderCornerRadius, paint);
-    bounds.Inset(kDummySearchBoxBorderWidth,
-                 kDummySearchBoxBorderWidth,
-                 kDummySearchBoxBorderWidth,
-                 kDummySearchBoxBorderBottomWidth);
-    paint.setColor(SK_ColorWHITE);
-    canvas->DrawRoundRect(bounds, kDummySearchBoxBorderCornerRadius, paint);
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(DummySearchBoxBackground);
-};
-
 // A placeholder search box which is sized to fit within the start page view.
 class DummySearchBoxView : public SearchBoxView {
  public:
   DummySearchBoxView(SearchBoxViewDelegate* delegate,
                      AppListViewDelegate* view_delegate)
       : SearchBoxView(delegate, view_delegate) {
-    set_background(new DummySearchBoxBackground());
   }
 
   virtual ~DummySearchBoxView() {}
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() const OVERRIDE {
-    return gfx::Size(kDummySearchBoxWidth, kDummySearchBoxHeight);
+    gfx::Size size(SearchBoxView::GetPreferredSize());
+    size.set_width(kDummySearchBoxWidth);
+    return size;
   }
 
  private:
@@ -117,11 +89,9 @@ StartPageView::StartPageView(AppListMainView* app_list_main_view,
   AddChildView(tiles_container_);
 
   SetModel(view_delegate_->GetModel());
-  view_delegate_->AddObserver(this);
 }
 
 StartPageView::~StartPageView() {
-  view_delegate_->RemoveObserver(this);
   if (search_results_model_)
     search_results_model_->RemoveObserver(this);
 }
@@ -130,7 +100,7 @@ void StartPageView::InitInstantContainer() {
   views::BoxLayout* instant_layout_manager = new views::BoxLayout(
       views::BoxLayout::kVertical, 0, 0, kInstantContainerSpacing);
   instant_layout_manager->set_inside_border_insets(
-      gfx::Insets(kTopMargin, 0, kInstantContainerSpacing, 0));
+      gfx::Insets(kTopMargin, 0, kSearchBoxAndTilesSpacing, 0));
   instant_layout_manager->set_main_axis_alignment(
       views::BoxLayout::MAIN_AXIS_ALIGNMENT_END);
   instant_layout_manager->set_cross_axis_alignment(
@@ -272,10 +242,6 @@ void StartPageView::QueryChanged(SearchBoxView* sender) {
   sender->search_box()->SetText(base::string16());
 }
 
-void StartPageView::OnProfilesChanged() {
-  SetModel(view_delegate_->GetModel());
-}
-
 void StartPageView::ListItemsAdded(size_t start, size_t count) {
   ScheduleUpdate();
 }