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

Side by Side Diff: chrome/browser/ui/views/tabs/tab_strip.h

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.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 CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 const ui::Event& event) OVERRIDE; 223 const ui::Event& event) OVERRIDE;
224 224
225 // View overrides. 225 // View overrides.
226 virtual const views::View* GetViewByID(int id) const OVERRIDE; 226 virtual const views::View* GetViewByID(int id) const OVERRIDE;
227 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 227 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
228 virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; 228 virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
229 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; 229 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
230 virtual void OnMouseCaptureLost() OVERRIDE; 230 virtual void OnMouseCaptureLost() OVERRIDE;
231 virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; 231 virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE;
232 virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; 232 virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
233 virtual ui::GestureStatus OnGestureEvent( 233 virtual ui::EventResult OnGestureEvent(
234 const ui::GestureEvent& event) OVERRIDE; 234 const ui::GestureEvent& event) OVERRIDE;
235 235
236 private: 236 private:
237 typedef std::map<int, std::vector<BaseTab*> > TabsClosingMap; 237 typedef std::map<int, std::vector<BaseTab*> > TabsClosingMap;
238 238
239 class RemoveTabDelegate; 239 class RemoveTabDelegate;
240 240
241 friend class TabDragController; 241 friend class TabDragController;
242 friend class TabDragControllerTest; 242 friend class TabDragControllerTest;
243 243
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 int mouse_move_count_; 568 int mouse_move_count_;
569 569
570 // Timer used when a tab is closed and we need to relayout. Only used when a 570 // Timer used when a tab is closed and we need to relayout. Only used when a
571 // tab close comes from a touch device. 571 // tab close comes from a touch device.
572 base::OneShotTimer<TabStrip> resize_layout_timer_; 572 base::OneShotTimer<TabStrip> resize_layout_timer_;
573 573
574 DISALLOW_COPY_AND_ASSIGN(TabStrip); 574 DISALLOW_COPY_AND_ASSIGN(TabStrip);
575 }; 575 };
576 576
577 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 577 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698