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

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

Issue 10832282: Replace views::MouseEvent with ui::MouseEvent (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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 }; 243 };
244 244
245 // OverFlowButton (chevron) -------------------------------------------------- 245 // OverFlowButton (chevron) --------------------------------------------------
246 246
247 class OverFlowButton : public views::MenuButton { 247 class OverFlowButton : public views::MenuButton {
248 public: 248 public:
249 explicit OverFlowButton(BookmarkBarView* owner) 249 explicit OverFlowButton(BookmarkBarView* owner)
250 : MenuButton(NULL, string16(), owner, false), 250 : MenuButton(NULL, string16(), owner, false),
251 owner_(owner) {} 251 owner_(owner) {}
252 252
253 virtual bool OnMousePressed(const views::MouseEvent& e) { 253 virtual bool OnMousePressed(const ui::MouseEvent& e) {
254 owner_->StopThrobbing(true); 254 owner_->StopThrobbing(true);
255 return views::MenuButton::OnMousePressed(e); 255 return views::MenuButton::OnMousePressed(e);
256 } 256 }
257 257
258 private: 258 private:
259 BookmarkBarView* owner_; 259 BookmarkBarView* owner_;
260 260
261 DISALLOW_COPY_AND_ASSIGN(OverFlowButton); 261 DISALLOW_COPY_AND_ASSIGN(OverFlowButton);
262 }; 262 };
263 263
(...skipping 1418 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/avatar_menu_bubble_view.cc ('k') | chrome/browser/ui/views/browser_action_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698