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

Side by Side Diff: ui/app_list/views/apps_container_view.h

Issue 253833004: Add vox support for reading unnamed folder description and fix a focus bug when app launcher is ope… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add a commnent. 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/app_list/views/apps_container_view.cc » ('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 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 #ifndef UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_
6 #define UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_
7 7
8 #include "ui/app_list/app_list_folder_item.h" 8 #include "ui/app_list/app_list_folder_item.h"
9 #include "ui/app_list/views/top_icon_animation_view.h" 9 #include "ui/app_list/views/top_icon_animation_view.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 virtual void OnTopIconAnimationsComplete() OVERRIDE; 70 virtual void OnTopIconAnimationsComplete() OVERRIDE;
71 71
72 AppsGridView* apps_grid_view() { return apps_grid_view_; } 72 AppsGridView* apps_grid_view() { return apps_grid_view_; }
73 FolderBackgroundView* folder_background_view() { 73 FolderBackgroundView* folder_background_view() {
74 return folder_background_view_; 74 return folder_background_view_;
75 } 75 }
76 AppListFolderView* app_list_folder_view() { return app_list_folder_view_; } 76 AppListFolderView* app_list_folder_view() { return app_list_folder_view_; }
77 77
78 private: 78 private:
79 enum ShowState { 79 enum ShowState {
80 SHOW_NONE, // initial state
80 SHOW_APPS, 81 SHOW_APPS,
81 SHOW_ACTIVE_FOLDER, 82 SHOW_ACTIVE_FOLDER,
82 SHOW_ITEM_REPARENT, 83 SHOW_ITEM_REPARENT,
83 }; 84 };
84 85
85 void SetShowState(ShowState show_state, bool show_apps_with_animation); 86 void SetShowState(ShowState show_state, bool show_apps_with_animation);
86 87
87 // Calculates the top item icon bounds in the active folder icon. The bounds 88 // Calculates the top item icon bounds in the active folder icon. The bounds
88 // is relative to AppsContainerView. 89 // is relative to AppsContainerView.
89 // Returns the bounds of top items' icon in sequence of top left, top right, 90 // Returns the bounds of top items' icon in sequence of top left, top right,
(...skipping 19 matching lines...) Expand all
109 110
110 size_t top_icon_animation_pending_count_; 111 size_t top_icon_animation_pending_count_;
111 112
112 DISALLOW_COPY_AND_ASSIGN(AppsContainerView); 113 DISALLOW_COPY_AND_ASSIGN(AppsContainerView);
113 }; 114 };
114 115
115 } // namespace app_list 116 } // namespace app_list
116 117
117 118
118 #endif // UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_ 119 #endif // UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ui/app_list/views/apps_container_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698