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

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

Issue 554553002: Fixed experimental app list pagination indicator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | ui/app_list/views/contents_switcher_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_CONTENTS_SWITCHER_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_
6 #define UI_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_
7 7
8 #include <map>
9
8 #include "base/basictypes.h" 10 #include "base/basictypes.h"
9 #include "ui/app_list/pagination_model_observer.h" 11 #include "ui/app_list/pagination_model_observer.h"
10 #include "ui/views/controls/button/button.h" 12 #include "ui/views/controls/button/button.h"
11 #include "ui/views/view.h" 13 #include "ui/views/view.h"
12 14
13 namespace app_list { 15 namespace app_list {
14 16
15 class ContentsView; 17 class ContentsView;
16 18
17 // A view that contains buttons to switch the displayed view in the given 19 // A view that contains buttons to switch the displayed view in the given
(...skipping 18 matching lines...) Expand all
36 const ui::Event& event) OVERRIDE; 38 const ui::Event& event) OVERRIDE;
37 39
38 // Overridden from PaginationModelObserver: 40 // Overridden from PaginationModelObserver:
39 virtual void TotalPagesChanged() OVERRIDE; 41 virtual void TotalPagesChanged() OVERRIDE;
40 virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE; 42 virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE;
41 virtual void TransitionStarted() OVERRIDE; 43 virtual void TransitionStarted() OVERRIDE;
42 virtual void TransitionChanged() OVERRIDE; 44 virtual void TransitionChanged() OVERRIDE;
43 45
44 ContentsView* contents_view_; // Owned by views hierarchy. 46 ContentsView* contents_view_; // Owned by views hierarchy.
45 47
46 // Stores Views owned by views hierarchy. 48 // Maps page indices to Views owned by views hierarchy.
47 std::vector<views::View*> page_active_indicators_; 49 std::map<int, views::View*> page_active_indicators_;
48 50
49 DISALLOW_COPY_AND_ASSIGN(ContentsSwitcherView); 51 DISALLOW_COPY_AND_ASSIGN(ContentsSwitcherView);
50 }; 52 };
51 53
52 } // namespace app_list 54 } // namespace app_list
53 55
54 #endif // UI_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_ 56 #endif // UI_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ui/app_list/views/contents_switcher_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698