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

Side by Side Diff: athena/home/athena_start_page_view.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase Created 6 years, 2 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 | « athena/home/app_list_view_delegate.h ('k') | athena/home/athena_start_page_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 ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_ 5 #ifndef ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_
6 #define ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_ 6 #define ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_
7 7
8 #include "athena/athena_export.h" 8 #include "athena/athena_export.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 15 matching lines...) Expand all
26 : public views::View, 26 : public views::View,
27 public app_list::SearchBoxViewDelegate, 27 public app_list::SearchBoxViewDelegate,
28 public app_list::AppListItemListObserver { 28 public app_list::AppListItemListObserver {
29 public: 29 public:
30 class Observer { 30 class Observer {
31 public: 31 public:
32 virtual void OnLayoutStateChanged(float new_state) = 0; 32 virtual void OnLayoutStateChanged(float new_state) = 0;
33 }; 33 };
34 34
35 explicit AthenaStartPageView(app_list::AppListViewDelegate* delegate); 35 explicit AthenaStartPageView(app_list::AppListViewDelegate* delegate);
36 virtual ~AthenaStartPageView(); 36 ~AthenaStartPageView() override;
37 37
38 // Requests the focus on the search box in the start page view. 38 // Requests the focus on the search box in the start page view.
39 void RequestFocusOnSearchBox(); 39 void RequestFocusOnSearchBox();
40 40
41 // Updates the layout state. See the comment of |layout_state_| field. 41 // Updates the layout state. See the comment of |layout_state_| field.
42 void SetLayoutState(float layout_state); 42 void SetLayoutState(float layout_state);
43 43
44 // Updates the layout state and move the subviews to the target location with 44 // Updates the layout state and move the subviews to the target location with
45 // animation. 45 // animation.
46 void SetLayoutStateWithAnimation(float layout_state, 46 void SetLayoutStateWithAnimation(float layout_state,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 // Schedules the animation for the layout the search box and the search 79 // Schedules the animation for the layout the search box and the search
80 // results. 80 // results.
81 void LayoutSearchResults(bool should_show_search_results); 81 void LayoutSearchResults(bool should_show_search_results);
82 82
83 // Called when the animation of search box / search results layout has 83 // Called when the animation of search box / search results layout has
84 // completed. 84 // completed.
85 void OnSearchResultLayoutAnimationCompleted(bool should_show_search_results); 85 void OnSearchResultLayoutAnimationCompleted(bool should_show_search_results);
86 86
87 // views::View: 87 // views::View:
88 virtual void Layout() override; 88 void Layout() override;
89 virtual bool OnKeyPressed(const ui::KeyEvent& key_event) override; 89 bool OnKeyPressed(const ui::KeyEvent& key_event) override;
90 90
91 // app_list::SearchBoxViewDelegate: 91 // app_list::SearchBoxViewDelegate:
92 virtual void QueryChanged(app_list::SearchBoxView* sender) override; 92 void QueryChanged(app_list::SearchBoxView* sender) override;
93 93
94 // app_list::AppListItemListObserver: 94 // app_list::AppListItemListObserver:
95 virtual void OnListItemAdded(size_t index, 95 void OnListItemAdded(size_t index, app_list::AppListItem* item) override;
96 app_list::AppListItem* item) override; 96 void OnListItemRemoved(size_t index, app_list::AppListItem* item) override;
97 virtual void OnListItemRemoved(size_t index, 97 void OnListItemMoved(size_t from_index,
98 app_list::AppListItem* item) override; 98 size_t to_index,
99 virtual void OnListItemMoved(size_t from_index, 99 app_list::AppListItem* item) override;
100 size_t to_index,
101 app_list::AppListItem* item) override;
102 100
103 // Not owned. 101 // Not owned.
104 app_list::AppListViewDelegate* delegate_; 102 app_list::AppListViewDelegate* delegate_;
105 103
106 // Views are owned through its hierarchy. 104 // Views are owned through its hierarchy.
107 views::View* system_info_view_; 105 views::View* system_info_view_;
108 views::View* app_icon_container_; 106 views::View* app_icon_container_;
109 views::View* search_box_container_; 107 views::View* search_box_container_;
110 views::View* control_icon_container_; 108 views::View* control_icon_container_;
111 views::View* logo_; 109 views::View* logo_;
(...skipping 14 matching lines...) Expand all
126 ObserverList<Observer> observers_; 124 ObserverList<Observer> observers_;
127 125
128 base::WeakPtrFactory<AthenaStartPageView> weak_factory_; 126 base::WeakPtrFactory<AthenaStartPageView> weak_factory_;
129 127
130 DISALLOW_COPY_AND_ASSIGN(AthenaStartPageView); 128 DISALLOW_COPY_AND_ASSIGN(AthenaStartPageView);
131 }; 129 };
132 130
133 } // namespace athena 131 } // namespace athena
134 132
135 #endif // ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_ 133 #endif // ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_
OLDNEW
« no previous file with comments | « athena/home/app_list_view_delegate.h ('k') | athena/home/athena_start_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698