Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: ui/app_list/views/start_page_view.cc

Issue 645853013: Remove some platform specific stuff from views. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/views/start_page_view.h ('k') | ui/app_list/views/test/apps_grid_view_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/start_page_view.cc
diff --git a/ui/app_list/views/start_page_view.cc b/ui/app_list/views/start_page_view.cc
deleted file mode 100644
index 580c986bb5d70af8f265f94ddb253b5fb8d627e6..0000000000000000000000000000000000000000
--- a/ui/app_list/views/start_page_view.cc
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright 2014 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/start_page_view.h"
-
-#include "base/strings/utf_string_conversions.h"
-#include "ui/app_list/app_list_constants.h"
-#include "ui/app_list/app_list_item.h"
-#include "ui/app_list/app_list_model.h"
-#include "ui/app_list/app_list_view_delegate.h"
-#include "ui/app_list/search_result.h"
-#include "ui/app_list/views/app_list_main_view.h"
-#include "ui/app_list/views/search_box_view.h"
-#include "ui/app_list/views/search_result_list_view.h"
-#include "ui/app_list/views/tile_item_view.h"
-#include "ui/gfx/canvas.h"
-#include "ui/views/background.h"
-#include "ui/views/controls/image_view.h"
-#include "ui/views/controls/label.h"
-#include "ui/views/controls/textfield/textfield.h"
-#include "ui/views/layout/box_layout.h"
-#include "ui/views/widget/widget.h"
-
-namespace app_list {
-
-namespace {
-
-// Layout constants.
-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 = 480;
-
-// Tile container constants.
-const size_t kNumStartPageTiles = 5;
-const int kTileSpacing = 10;
-
-// 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) {
- }
-
- virtual ~DummySearchBoxView() {}
-
- // Overridden from views::View:
- virtual gfx::Size GetPreferredSize() const override {
- gfx::Size size(SearchBoxView::GetPreferredSize());
- size.set_width(kDummySearchBoxWidth);
- return size;
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DummySearchBoxView);
-};
-
-} // namespace
-
-StartPageView::StartPageView(AppListMainView* app_list_main_view,
- AppListViewDelegate* view_delegate)
- : app_list_main_view_(app_list_main_view),
- search_results_model_(NULL),
- view_delegate_(view_delegate),
- search_box_view_(new DummySearchBoxView(this, view_delegate_)),
- results_view_(
- new SearchResultListView(app_list_main_view, view_delegate)),
- instant_container_(new views::View),
- tiles_container_(new views::View),
- show_state_(SHOW_START_PAGE),
- update_factory_(this) {
- // The view containing the start page WebContents and DummySearchBoxView.
- InitInstantContainer();
- AddChildView(instant_container_);
-
- // The view containing the search results.
- AddChildView(results_view_);
-
- // The view containing the start page tiles.
- InitTilesContainer();
- AddChildView(tiles_container_);
-
- SetModel(view_delegate_->GetModel());
-}
-
-StartPageView::~StartPageView() {
- if (search_results_model_)
- search_results_model_->RemoveObserver(this);
-}
-
-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, kSearchBoxAndTilesSpacing, 0));
- instant_layout_manager->set_main_axis_alignment(
- views::BoxLayout::MAIN_AXIS_ALIGNMENT_END);
- instant_layout_manager->set_cross_axis_alignment(
- views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
- instant_container_->SetLayoutManager(instant_layout_manager);
-
- views::View* web_view = view_delegate_->CreateStartPageWebView(
- gfx::Size(kWebViewWidth, kWebViewHeight));
- if (web_view)
- instant_container_->AddChildView(web_view);
-
- // TODO(calamity): This container is needed to horizontally center the search
- // box view. Remove this container once BoxLayout supports CrossAxisAlignment.
- views::View* search_box_container = new views::View();
- views::BoxLayout* layout_manager =
- new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
- layout_manager->set_main_axis_alignment(
- views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
- search_box_container->SetLayoutManager(layout_manager);
- search_box_container->AddChildView(search_box_view_);
-
- instant_container_->AddChildView(search_box_container);
-}
-
-void StartPageView::InitTilesContainer() {
- views::BoxLayout* tiles_layout_manager =
- new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, kTileSpacing);
- tiles_layout_manager->set_main_axis_alignment(
- views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
- tiles_container_->SetLayoutManager(tiles_layout_manager);
- for (size_t i = 0; i < kNumStartPageTiles; ++i) {
- TileItemView* tile_item = new TileItemView();
- tiles_container_->AddChildView(tile_item);
- tile_views_.push_back(tile_item);
- }
-}
-
-void StartPageView::SetModel(AppListModel* model) {
- DCHECK(model);
- if (search_results_model_)
- search_results_model_->RemoveObserver(this);
- search_results_model_ = model->results();
- search_results_model_->AddObserver(this);
- results_view_->SetResults(search_results_model_);
- Reset();
-}
-
-void StartPageView::Reset() {
- SetShowState(SHOW_START_PAGE);
- Update();
-}
-
-void StartPageView::ShowSearchResults() {
- SetShowState(SHOW_SEARCH_RESULTS);
- Update();
-}
-
-void StartPageView::SetShowState(ShowState show_state) {
- instant_container_->SetVisible(show_state == SHOW_START_PAGE);
- results_view_->SetVisible(show_state == SHOW_SEARCH_RESULTS);
-
- // This can be called when the app list is closing (widget is invisible). In
- // that case, do not steal focus from other elements.
- if (show_state == SHOW_START_PAGE && GetWidget() && GetWidget()->IsVisible())
- search_box_view_->search_box()->RequestFocus();
-
- if (show_state_ == show_state)
- return;
-
- show_state_ = show_state;
-
- if (show_state_ == SHOW_START_PAGE)
- search_box_view_->ClearSearch();
-
- results_view_->UpdateAutoLaunchState();
- if (show_state == SHOW_SEARCH_RESULTS)
- results_view_->SetSelectedIndex(0);
-}
-
-bool StartPageView::IsShowingSearchResults() const {
- return show_state_ == SHOW_SEARCH_RESULTS;
-}
-
-void StartPageView::UpdateForTesting() {
- Update();
-}
-
-bool StartPageView::OnKeyPressed(const ui::KeyEvent& event) {
- if (show_state_ == SHOW_SEARCH_RESULTS)
- return results_view_->OnKeyPressed(event);
-
- return false;
-}
-
-void StartPageView::Layout() {
- // Instant and search results take up the height of the instant container.
- gfx::Rect bounds(GetContentsBounds());
- bounds.set_height(instant_container_->GetHeightForWidth(bounds.width()));
- instant_container_->SetBoundsRect(bounds);
- results_view_->SetBoundsRect(bounds);
-
- // Tiles begin where the instant container ends.
- bounds.set_y(bounds.bottom());
- bounds.set_height(tiles_container_->GetHeightForWidth(bounds.width()));
- tiles_container_->SetBoundsRect(bounds);
-}
-
-void StartPageView::Update() {
- std::vector<SearchResult*> display_results =
- AppListModel::FilterSearchResultsByDisplayType(search_results_model_,
- SearchResult::DISPLAY_TILE,
- kNumStartPageTiles);
- for (size_t i = 0; i < kNumStartPageTiles; ++i) {
- SearchResult* item = NULL;
- if (i < display_results.size())
- item = display_results[i];
- tile_views_[i]->SetSearchResult(item);
- }
- tiles_container_->Layout();
- Layout();
- update_factory_.InvalidateWeakPtrs();
-}
-
-void StartPageView::ScheduleUpdate() {
- // When search results are added one by one, each addition generates an update
- // request. Consolidates those update requests into one Update call.
- if (!update_factory_.HasWeakPtrs()) {
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&StartPageView::Update, update_factory_.GetWeakPtr()));
- }
-}
-
-void StartPageView::QueryChanged(SearchBoxView* sender) {
- // Forward the search terms on to the real search box and clear the dummy
- // search box.
- app_list_main_view_->OnStartPageSearchTextfieldChanged(
- sender->search_box()->text());
- sender->search_box()->SetText(base::string16());
-}
-
-void StartPageView::ListItemsAdded(size_t start, size_t count) {
- ScheduleUpdate();
-}
-
-void StartPageView::ListItemsRemoved(size_t start, size_t count) {
- ScheduleUpdate();
-}
-
-void StartPageView::ListItemMoved(size_t index, size_t target_index) {
- ScheduleUpdate();
-}
-
-void StartPageView::ListItemsChanged(size_t start, size_t count) {
- ScheduleUpdate();
-}
-
-} // namespace app_list
« no previous file with comments | « ui/app_list/views/start_page_view.h ('k') | ui/app_list/views/test/apps_grid_view_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698