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

Side by Side Diff: chrome/browser/views/bookmark_bar_view.h

Issue 3056003: Attemp 2 at: (Closed)
Patch Set: Fix chromeos breakage Created 10 years, 5 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 | « chrome/browser/view_ids.h ('k') | chrome/browser/views/bookmark_bar_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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "app/slide_animation.h" 10 #include "app/slide_animation.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 155
156 // Returns the model. 156 // Returns the model.
157 BookmarkModel* GetModel() { return model_; } 157 BookmarkModel* GetModel() { return model_; }
158 158
159 // Returns true if the bookmarks bar preference is set to 'always show'. 159 // Returns true if the bookmarks bar preference is set to 'always show'.
160 bool IsAlwaysShown() const; 160 bool IsAlwaysShown() const;
161 161
162 // True if we're on a page where the bookmarks bar is always visible. 162 // True if we're on a page where the bookmarks bar is always visible.
163 bool OnNewTabPage() const; 163 bool OnNewTabPage() const;
164 164
165 // True if we're on an extension apps page.
166 bool OnAppsPage() const;
167
168 // How much we want the bookmark bar to overlap the toolbar. If |return_max| 165 // How much we want the bookmark bar to overlap the toolbar. If |return_max|
169 // is true, we return the maximum overlap rather than the current overlap. 166 // is true, we return the maximum overlap rather than the current overlap.
170 int GetToolbarOverlap(bool return_max); 167 int GetToolbarOverlap(bool return_max);
171 168
172 // Whether or not we are animating. 169 // Whether or not we are animating.
173 bool is_animating() { return size_animation_->is_animating(); } 170 bool is_animating() { return size_animation_->is_animating(); }
174 171
175 // SlideAnimationDelegate implementation. 172 // SlideAnimationDelegate implementation.
176 void AnimationProgressed(const Animation* animation); 173 void AnimationProgressed(const Animation* animation);
177 void AnimationEnded(const Animation* animation); 174 void AnimationEnded(const Animation* animation);
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 // overflow_button_ or a button on the bar. 485 // overflow_button_ or a button on the bar.
489 views::CustomButton* throbbing_view_; 486 views::CustomButton* throbbing_view_;
490 487
491 // Background for extension toolstrips. 488 // Background for extension toolstrips.
492 SkBitmap toolstrip_background_; 489 SkBitmap toolstrip_background_;
493 490
494 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); 491 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
495 }; 492 };
496 493
497 #endif // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ 494 #endif // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/view_ids.h ('k') | chrome/browser/views/bookmark_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698