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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 10824295: Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
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 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 #include "ui/views/metrics.h" 69 #include "ui/views/metrics.h"
70 #include "ui/views/view_constants.h" 70 #include "ui/views/view_constants.h"
71 #include "ui/views/widget/tooltip_manager.h" 71 #include "ui/views/widget/tooltip_manager.h"
72 #include "ui/views/widget/widget.h" 72 #include "ui/views/widget/widget.h"
73 73
74 using content::OpenURLParams; 74 using content::OpenURLParams;
75 using content::PageNavigator; 75 using content::PageNavigator;
76 using content::Referrer; 76 using content::Referrer;
77 using content::UserMetricsAction; 77 using content::UserMetricsAction;
78 using views::CustomButton; 78 using views::CustomButton;
79 using views::DropTargetEvent; 79 using ui::DropTargetEvent;
80 using views::MenuButton; 80 using views::MenuButton;
81 using views::MenuItemView; 81 using views::MenuItemView;
82 using views::View; 82 using views::View;
83 83
84 // How much we want the bookmark bar to overlap the toolbar when in its 84 // How much we want the bookmark bar to overlap the toolbar when in its
85 // 'always shown' mode. 85 // 'always shown' mode.
86 static const int kToolbarOverlap = 3; 86 static const int kToolbarOverlap = 3;
87 87
88 // Margins around the content. 88 // Margins around the content.
89 static const int kDetachedTopMargin = 1; // When attached, we use 0 and let the 89 static const int kDetachedTopMargin = 1; // When attached, we use 0 and let the
(...skipping 1592 matching lines...) Expand 10 before | Expand all | Expand 10 after
1682 (1 - size_animation_->GetCurrentValue()))); 1682 (1 - size_animation_->GetCurrentValue())));
1683 } else { 1683 } else {
1684 prefsize.set_height( 1684 prefsize.set_height(
1685 static_cast<int>( 1685 static_cast<int>(
1686 browser_defaults::kBookmarkBarHeight * 1686 browser_defaults::kBookmarkBarHeight *
1687 size_animation_->GetCurrentValue())); 1687 size_animation_->GetCurrentValue()));
1688 } 1688 }
1689 } 1689 }
1690 return prefsize; 1690 return prefsize;
1691 } 1691 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.h ('k') | chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698