| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/app_list_folder_view.h" | 5 #include "ui/app_list/views/app_list_folder_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ui/app_list/app_list_constants.h" | 9 #include "ui/app_list/app_list_constants.h" |
| 10 #include "ui/app_list/app_list_folder_item.h" | 10 #include "ui/app_list/app_list_folder_item.h" |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 const ui::LocatedEvent& event) { | 261 const ui::LocatedEvent& event) { |
| 262 container_view_->apps_grid_view()->UpdateDragFromReparentItem(pointer, event); | 262 container_view_->apps_grid_view()->UpdateDragFromReparentItem(pointer, event); |
| 263 } | 263 } |
| 264 | 264 |
| 265 void AppListFolderView::DispatchEndDragEventForReparent( | 265 void AppListFolderView::DispatchEndDragEventForReparent( |
| 266 bool events_forwarded_to_drag_drop_host) { | 266 bool events_forwarded_to_drag_drop_host) { |
| 267 container_view_->apps_grid_view()-> | 267 container_view_->apps_grid_view()-> |
| 268 EndDragFromReparentItemInRootLevel(events_forwarded_to_drag_drop_host); | 268 EndDragFromReparentItemInRootLevel(events_forwarded_to_drag_drop_host); |
| 269 } | 269 } |
| 270 | 270 |
| 271 |
| 272 void AppListFolderView::HideViewImmediately() { |
| 273 SetVisible(false); |
| 274 hide_for_reparent_ = false; |
| 275 } |
| 276 |
| 271 void AppListFolderView::NavigateBack(AppListFolderItem* item, | 277 void AppListFolderView::NavigateBack(AppListFolderItem* item, |
| 272 const ui::Event& event_flags) { | 278 const ui::Event& event_flags) { |
| 273 container_view_->ShowApps(item); | 279 container_view_->ShowApps(item); |
| 274 } | 280 } |
| 275 | 281 |
| 276 } // namespace app_list | 282 } // namespace app_list |
| OLD | NEW |