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

Side by Side Diff: ui/app_list/views/contents_view.cc

Issue 136303008: Implement ui for re-parenting an item from an app list folder to another position or folder in the … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments. Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/app_list/views/apps_grid_view.cc ('k') | ui/app_list/views/folder_background_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/contents_view.h" 5 #include "ui/app_list/views/contents_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/app_list/app_list_constants.h" 10 #include "ui/app_list/app_list_constants.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 ContentsView::~ContentsView() { 76 ContentsView::~ContentsView() {
77 } 77 }
78 78
79 void ContentsView::CancelDrag() { 79 void ContentsView::CancelDrag() {
80 if (apps_container_view_->apps_grid_view()->has_dragged_view()) 80 if (apps_container_view_->apps_grid_view()->has_dragged_view())
81 apps_container_view_->apps_grid_view()->EndDrag(true); 81 apps_container_view_->apps_grid_view()->EndDrag(true);
82 } 82 }
83 83
84 void ContentsView::SetDragAndDropHostOfCurrentAppList( 84 void ContentsView::SetDragAndDropHostOfCurrentAppList(
85 ApplicationDragAndDropHost* drag_and_drop_host) { 85 ApplicationDragAndDropHost* drag_and_drop_host) {
86 apps_container_view_->apps_grid_view()-> 86 apps_container_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
87 SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
88 } 87 }
89 88
90 void ContentsView::SetShowState(ShowState show_state) { 89 void ContentsView::SetShowState(ShowState show_state) {
91 if (show_state_ == show_state) 90 if (show_state_ == show_state)
92 return; 91 return;
93 92
94 show_state_ = show_state; 93 show_state_ = show_state;
95 ShowStateChanged(); 94 ShowStateChanged();
96 } 95 }
97 96
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 if (!pagination_model_->has_transition()) { 268 if (!pagination_model_->has_transition()) {
270 pagination_model_->SelectPageRelative(offset > 0 ? -1 : 1, 269 pagination_model_->SelectPageRelative(offset > 0 ? -1 : 1,
271 true); 270 true);
272 } 271 }
273 event->SetHandled(); 272 event->SetHandled();
274 event->StopPropagation(); 273 event->StopPropagation();
275 } 274 }
276 } 275 }
277 276
278 } // namespace app_list 277 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/views/apps_grid_view.cc ('k') | ui/app_list/views/folder_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698