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

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

Issue 265723003: Fix app list drag view being hidden on reparent when synchronous drag is setting up. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@app_list_win_stuck_icons_real
Patch Set: address comments Created 6 years, 7 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
OLDNEW
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 "grit/ui_strings.h" 9 #include "grit/ui_strings.h"
10 #include "ui/accessibility/ax_view_state.h" 10 #include "ui/accessibility/ax_view_state.h"
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 if (items_grid_view()->dragging()) 295 if (items_grid_view()->dragging())
296 items_grid_view()->EndDrag(true); 296 items_grid_view()->EndDrag(true);
297 items_grid_view()->ClearAnySelectedView(); 297 items_grid_view()->ClearAnySelectedView();
298 container_view_->ShowApps(folder_item_); 298 container_view_->ShowApps(folder_item_);
299 } 299 }
300 300
301 bool AppListFolderView::IsOEMFolder() const { 301 bool AppListFolderView::IsOEMFolder() const {
302 return folder_item_->folder_type() == AppListFolderItem::FOLDER_TYPE_OEM; 302 return folder_item_->folder_type() == AppListFolderItem::FOLDER_TYPE_OEM;
303 } 303 }
304 304
305 void AppListFolderView::SetRootLevelDragViewVisible(bool visible) {
306 container_view_->apps_grid_view()->SetDragViewVisible(visible);
307 }
308
305 void AppListFolderView::GetAccessibleState(ui::AXViewState* state) { 309 void AppListFolderView::GetAccessibleState(ui::AXViewState* state) {
306 state->role = ui::AX_ROLE_BUTTON; 310 state->role = ui::AX_ROLE_BUTTON;
307 state->name = accessible_name_; 311 state->name = accessible_name_;
308 } 312 }
309 313
310 void AppListFolderView::NavigateBack(AppListFolderItem* item, 314 void AppListFolderView::NavigateBack(AppListFolderItem* item,
311 const ui::Event& event_flags) { 315 const ui::Event& event_flags) {
312 CloseFolderPage(); 316 CloseFolderPage();
313 } 317 }
314 318
315 void AppListFolderView::GiveBackFocusToSearchBox() { 319 void AppListFolderView::GiveBackFocusToSearchBox() {
316 app_list_main_view_->search_box_view()->search_box()->RequestFocus(); 320 app_list_main_view_->search_box_view()->search_box()->RequestFocus();
317 } 321 }
318 322
319 void AppListFolderView::SetItemName(AppListFolderItem* item, 323 void AppListFolderView::SetItemName(AppListFolderItem* item,
320 const std::string& name) { 324 const std::string& name) {
321 model_->SetItemName(item, name); 325 model_->SetItemName(item, name);
322 } 326 }
323 327
324 } // namespace app_list 328 } // namespace app_list
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698