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

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

Issue 582923002: Do not EASE_IN_OUT after fling, rather EASE_OUT. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix 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 | 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 "ui/app_list/views/search_box_view_delegate.h" 10 #include "ui/app_list/views/search_box_view_delegate.h"
11 #include "ui/gfx/animation/tween.h"
11 #include "ui/views/view.h" 12 #include "ui/views/view.h"
12 13
13 namespace app_list { 14 namespace app_list {
14 class AppListViewDelegate; 15 class AppListViewDelegate;
15 class SearchBoxView; 16 class SearchBoxView;
16 class SearchResultListView; 17 class SearchResultListView;
17 } 18 }
18 19
19 namespace athena { 20 namespace athena {
20 21
21 class ATHENA_EXPORT AthenaStartPageView 22 class ATHENA_EXPORT AthenaStartPageView
22 : public views::View, 23 : public views::View,
23 public app_list::SearchBoxViewDelegate { 24 public app_list::SearchBoxViewDelegate {
24 public: 25 public:
25 explicit AthenaStartPageView(app_list::AppListViewDelegate* delegate); 26 explicit AthenaStartPageView(app_list::AppListViewDelegate* delegate);
26 virtual ~AthenaStartPageView(); 27 virtual ~AthenaStartPageView();
27 28
28 // Requests the focus on the search box in the start page view. 29 // Requests the focus on the search box in the start page view.
29 void RequestFocusOnSearchBox(); 30 void RequestFocusOnSearchBox();
30 31
31 // Updates the layout state. See the comment of |layout_state_| field. 32 // Updates the layout state. See the comment of |layout_state_| field.
32 void SetLayoutState(float layout_state); 33 void SetLayoutState(float layout_state);
33 34
34 // Updates the layout state and move the subviews to the target location with 35 // Updates the layout state and move the subviews to the target location with
35 // animation. 36 // animation.
36 void SetLayoutStateWithAnimation(float layout_state); 37 void SetLayoutStateWithAnimation(float layout_state,
38 gfx::Tween::Type tween_type);
37 39
38 private: 40 private:
39 friend class AthenaStartPageViewTest; 41 friend class AthenaStartPageViewTest;
40 42
41 static const char kViewClassName[]; 43 static const char kViewClassName[];
42 44
43 // A struct which bundles the layout data of subviews. 45 // A struct which bundles the layout data of subviews.
44 struct LayoutData { 46 struct LayoutData {
45 gfx::Rect search_box; 47 gfx::Rect search_box;
46 gfx::Rect icons; 48 gfx::Rect icons;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 float layout_state_; 99 float layout_state_;
98 100
99 base::WeakPtrFactory<AthenaStartPageView> weak_factory_; 101 base::WeakPtrFactory<AthenaStartPageView> weak_factory_;
100 102
101 DISALLOW_COPY_AND_ASSIGN(AthenaStartPageView); 103 DISALLOW_COPY_AND_ASSIGN(AthenaStartPageView);
102 }; 104 };
103 105
104 } // namespace athena 106 } // namespace athena
105 107
106 #endif // ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_ 108 #endif // ATHENA_HOME_ATHENA_START_PAGE_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | athena/home/athena_start_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698