Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/app_list/views/apps_grid_view.h" | 5 #include "ui/app_list/views/apps_grid_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 321 bounds_animator_(this), | 321 bounds_animator_(this), |
| 322 is_root_level_(true), | 322 is_root_level_(true), |
| 323 activated_item_view_(NULL), | 323 activated_item_view_(NULL), |
| 324 dragging_for_reparent_item_(false) { | 324 dragging_for_reparent_item_(false) { |
| 325 SetPaintToLayer(true); | 325 SetPaintToLayer(true); |
| 326 SetFillsBoundsOpaquely(false); | 326 SetFillsBoundsOpaquely(false); |
| 327 | 327 |
| 328 pagination_model_->AddObserver(this); | 328 pagination_model_->AddObserver(this); |
| 329 AddChildView(page_switcher_view_); | 329 AddChildView(page_switcher_view_); |
| 330 | 330 |
| 331 if (start_page_contents) { | 331 if (start_page_contents && app_list::switches::IsStartPageWebUIEnabled()) { |
|
tapted
2014/03/10 02:41:54
With StartPageService::GetSearchPageContents(..) t
calamity
2014/03/14 07:50:02
Holding off on this in case we can just remove the
| |
| 332 start_page_view_ = | 332 start_page_view_ = |
| 333 new views::WebView(start_page_contents->GetBrowserContext()); | 333 new views::WebView(start_page_contents->GetBrowserContext()); |
| 334 start_page_view_->SetWebContents(start_page_contents); | 334 start_page_view_->SetWebContents(start_page_contents); |
| 335 AddChildView(start_page_view_); | 335 AddChildView(start_page_view_); |
| 336 } | 336 } |
| 337 } | 337 } |
| 338 | 338 |
| 339 AppsGridView::~AppsGridView() { | 339 AppsGridView::~AppsGridView() { |
| 340 // Coming here |drag_view_| should already be canceled since otherwise the | 340 // Coming here |drag_view_| should already be canceled since otherwise the |
| 341 // drag would disappear after the app list got animated away and closed, | 341 // drag would disappear after the app list got animated away and closed, |
| (...skipping 1704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2046 void AppsGridView::SetAsFolderDroppingTarget(const Index& target_index, | 2046 void AppsGridView::SetAsFolderDroppingTarget(const Index& target_index, |
| 2047 bool is_target_folder) { | 2047 bool is_target_folder) { |
| 2048 AppListItemView* target_view = | 2048 AppListItemView* target_view = |
| 2049 static_cast<AppListItemView*>( | 2049 static_cast<AppListItemView*>( |
| 2050 GetViewAtSlotOnCurrentPage(target_index.slot)); | 2050 GetViewAtSlotOnCurrentPage(target_index.slot)); |
| 2051 if (target_view) | 2051 if (target_view) |
| 2052 target_view->SetAsAttemptedFolderTarget(is_target_folder); | 2052 target_view->SetAsAttemptedFolderTarget(is_target_folder); |
| 2053 } | 2053 } |
| 2054 | 2054 |
| 2055 } // namespace app_list | 2055 } // namespace app_list |
| OLD | NEW |