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

Side by Side Diff: chrome/browser/ui/gtk/tabs/tab_gtk.h

Issue 8632022: Add OVERRIDE to chrome/browser/ui/gtk/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_GTK_TABS_TAB_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_TABS_TAB_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_TABS_TAB_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_TABS_TAB_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h"
10 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
11 #include "base/message_loop.h" 12 #include "base/message_loop.h"
12 #include "chrome/browser/tabs/tab_strip_model.h" 13 #include "chrome/browser/tabs/tab_strip_model.h"
13 #include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h" 14 #include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h"
14 #include "ui/base/gtk/gtk_signal.h" 15 #include "ui/base/gtk/gtk_signal.h"
15 16
16 class TabStripMenuController; 17 class TabStripMenuController;
17 class ThemeService; 18 class ThemeService;
18 19
19 class TabGtk : public TabRendererGtk, 20 class TabGtk : public TabRendererGtk,
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 bool closing() const { return closing_; } 108 bool closing() const { return closing_; }
108 109
109 // Used to set/check whether this Tab is being dragged. 110 // Used to set/check whether this Tab is being dragged.
110 void set_dragging(bool dragging) { dragging_ = dragging; } 111 void set_dragging(bool dragging) { dragging_ = dragging; }
111 bool dragging() const { return dragging_; } 112 bool dragging() const { return dragging_; }
112 113
113 // Raise to top of Z-order. 114 // Raise to top of Z-order.
114 void Raise() const; 115 void Raise() const;
115 116
116 // TabRendererGtk overrides: 117 // TabRendererGtk overrides:
117 virtual bool IsActive() const; 118 virtual bool IsActive() const OVERRIDE;
118 virtual bool IsSelected() const; 119 virtual bool IsSelected() const OVERRIDE;
119 virtual bool IsVisible() const; 120 virtual bool IsVisible() const OVERRIDE;
120 virtual void SetVisible(bool visible) const; 121 virtual void SetVisible(bool visible) const OVERRIDE;
121 virtual void CloseButtonClicked(); 122 virtual void CloseButtonClicked() OVERRIDE;
122 virtual void UpdateData(TabContents* contents, bool app, bool loading_only); 123 virtual void UpdateData(TabContents* contents,
123 virtual void SetBounds(const gfx::Rect& bounds); 124 bool app,
125 bool loading_only) OVERRIDE;
126 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
124 127
125 private: 128 private:
126 class TabGtkObserverHelper; 129 class TabGtkObserverHelper;
127 130
128 // MessageLoop::Observer implementation: 131 // MessageLoop::Observer implementation:
129 virtual void WillProcessEvent(GdkEvent* event); 132 virtual void WillProcessEvent(GdkEvent* event) OVERRIDE;
130 virtual void DidProcessEvent(GdkEvent* event); 133 virtual void DidProcessEvent(GdkEvent* event) OVERRIDE;
131 134
132 // button-press-event handler that handles mouse clicks. 135 // button-press-event handler that handles mouse clicks.
133 CHROMEGTK_CALLBACK_1(TabGtk, gboolean, OnButtonPressEvent, GdkEventButton*); 136 CHROMEGTK_CALLBACK_1(TabGtk, gboolean, OnButtonPressEvent, GdkEventButton*);
134 137
135 // button-release-event handler that handles mouse click releases. 138 // button-release-event handler that handles mouse click releases.
136 CHROMEGTK_CALLBACK_1(TabGtk, gboolean, OnButtonReleaseEvent, GdkEventButton*); 139 CHROMEGTK_CALLBACK_1(TabGtk, gboolean, OnButtonReleaseEvent, GdkEventButton*);
137 140
138 // drag-begin is emitted when the drag is started. We connect so that we can 141 // drag-begin is emitted when the drag is started. We connect so that we can
139 // set the drag icon to a transparent pixbuf. 142 // set the drag icon to a transparent pixbuf.
140 CHROMEGTK_CALLBACK_1(TabGtk, void, OnDragBegin, GdkDragContext*); 143 CHROMEGTK_CALLBACK_1(TabGtk, void, OnDragBegin, GdkDragContext*);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 // mouse release event on the the dragged widget, otherwise, we don't know 218 // mouse release event on the the dragged widget, otherwise, we don't know
216 // when the drag has ended when the user presses space or enter. We queue 219 // when the drag has ended when the user presses space or enter. We queue
217 // a task to end the drag and only run it if GTK+ didn't send us the 220 // a task to end the drag and only run it if GTK+ didn't send us the
218 // drag-failed event. 221 // drag-failed event.
219 base::WeakPtrFactory<TabGtk> drag_end_factory_; 222 base::WeakPtrFactory<TabGtk> drag_end_factory_;
220 223
221 DISALLOW_COPY_AND_ASSIGN(TabGtk); 224 DISALLOW_COPY_AND_ASSIGN(TabGtk);
222 }; 225 };
223 226
224 #endif // CHROME_BROWSER_UI_GTK_TABS_TAB_GTK_H_ 227 #endif // CHROME_BROWSER_UI_GTK_TABS_TAB_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/tabs/dragged_view_gtk.h ('k') | chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698