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

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

Issue 2951903004: Added back button when in folder view. (Closed)
Patch Set: Created 3 years, 6 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 (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/app_list_view.h" 5 #include "ui/app_list/views/app_list_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 } 841 }
842 case FULLSCREEN_SEARCH: 842 case FULLSCREEN_SEARCH:
843 case FULLSCREEN_ALL_APPS: 843 case FULLSCREEN_ALL_APPS:
844 case CLOSED: 844 case CLOSED:
845 NOTREACHED(); 845 NOTREACHED();
846 break; 846 break;
847 } 847 }
848 break; 848 break;
849 case FULLSCREEN_ALL_APPS: 849 case FULLSCREEN_ALL_APPS:
850 new_widget_bounds.set_y(0); 850 new_widget_bounds.set_y(0);
851 if (app_list_main_view()
852 ->contents_view()
853 ->apps_container_view()
854 ->IsInFolderView())
855 app_list_main_view()
vadimt 2017/06/22 00:36:12 Add {}
newcomer 2017/06/22 16:49:06 Done.
856 ->contents_view()
857 ->apps_container_view()
858 ->app_list_folder_view()
859 ->CloseFolderPage();
851 app_list_main_view_->contents_view()->SetActiveState( 860 app_list_main_view_->contents_view()->SetActiveState(
852 AppListModel::STATE_APPS); 861 AppListModel::STATE_APPS);
853 break; 862 break;
854 case FULLSCREEN_SEARCH: 863 case FULLSCREEN_SEARCH:
855 new_widget_bounds.set_y(0); 864 new_widget_bounds.set_y(0);
856 break; 865 break;
857 case CLOSED: 866 case CLOSED:
858 app_list_main_view_->Close(); 867 app_list_main_view_->Close();
859 delegate_->Dismiss(); 868 delegate_->Dismiss();
860 break; 869 break;
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 .work_area() 967 .work_area()
959 .size(); 968 .size();
960 size.Enlarge(0, kShelfSize); 969 size.Enlarge(0, kShelfSize);
961 fullscreen_widget_->SetSize(size); 970 fullscreen_widget_->SetSize(size);
962 971
963 // Update the |fullscreen_widget_| bounds to accomodate the new work area. 972 // Update the |fullscreen_widget_| bounds to accomodate the new work area.
964 SetState(app_list_state_); 973 SetState(app_list_state_);
965 } 974 }
966 975
967 } // namespace app_list 976 } // namespace app_list
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698