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

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

Issue 907833002: Hide experimental app list Google logo and custom launcher page when search engine is not Google. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@update_app_list_bg_color
Patch Set: address comment, add service dependency Created 5 years, 10 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 | « ui/app_list/views/app_list_main_view.cc ('k') | ui/app_list/views/contents_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 (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 #ifndef UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
6 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 // on-screen or off-screen). 141 // on-screen or off-screen).
142 gfx::Rect GetCustomPageCollapsedBounds() const; 142 gfx::Rect GetCustomPageCollapsedBounds() const;
143 143
144 // Exposes GetAnimatorForTransition for tests. 144 // Exposes GetAnimatorForTransition for tests.
145 ContentsAnimator* GetAnimatorForTransitionForTests(int from_page, 145 ContentsAnimator* GetAnimatorForTransitionForTests(int from_page,
146 int to_page, 146 int to_page,
147 bool* reverse) const { 147 bool* reverse) const {
148 return GetAnimatorForTransition(from_page, to_page, reverse); 148 return GetAnimatorForTransition(from_page, to_page, reverse);
149 } 149 }
150 150
151 // Determines whether the custom page clickzone widget should be displayed.
152 bool ShouldShowCustomPageClickzone() const;
153
154 // Performs the 'back' action for the active page. Returns whether the action 151 // Performs the 'back' action for the active page. Returns whether the action
155 // was handled. 152 // was handled.
156 bool Back(); 153 bool Back();
157 154
158 // Overridden from views::View: 155 // Overridden from views::View:
159 gfx::Size GetPreferredSize() const override; 156 gfx::Size GetPreferredSize() const override;
160 void Layout() override; 157 void Layout() override;
161 bool OnKeyPressed(const ui::KeyEvent& event) override; 158 bool OnKeyPressed(const ui::KeyEvent& event) override;
162 159
163 // Overridden from PaginationModelObserver: 160 // Overridden from PaginationModelObserver:
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 246
250 // The animator for transitions not found in |contents_animators_|. 247 // The animator for transitions not found in |contents_animators_|.
251 scoped_ptr<ContentsAnimator> default_animator_; 248 scoped_ptr<ContentsAnimator> default_animator_;
252 249
253 DISALLOW_COPY_AND_ASSIGN(ContentsView); 250 DISALLOW_COPY_AND_ASSIGN(ContentsView);
254 }; 251 };
255 252
256 } // namespace app_list 253 } // namespace app_list
257 254
258 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ 255 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_main_view.cc ('k') | ui/app_list/views/contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698