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

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

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 // 158 //
159 // Note that we adjust the direction of both the URL and the title based on 159 // Note that we adjust the direction of both the URL and the title based on
160 // the locale so that pure LTR strings are displayed properly in RTL locales. 160 // the locale so that pure LTR strings are displayed properly in RTL locales.
161 static base::string16 CreateToolTipForURLAndTitle(const views::Widget* widget, 161 static base::string16 CreateToolTipForURLAndTitle(const views::Widget* widget,
162 const gfx::Point& screen_loc, 162 const gfx::Point& screen_loc,
163 const GURL& url, 163 const GURL& url,
164 const base::string16& title, 164 const base::string16& title,
165 Profile* profile); 165 Profile* profile);
166 166
167 // DetachableToolbarView methods: 167 // DetachableToolbarView methods:
168 virtual bool IsDetached() const OVERRIDE; 168 virtual bool IsDetached() const override;
169 virtual double GetAnimationValue() const OVERRIDE; 169 virtual double GetAnimationValue() const override;
170 virtual int GetToolbarOverlap() const OVERRIDE; 170 virtual int GetToolbarOverlap() const override;
171 171
172 // View methods: 172 // View methods:
173 virtual gfx::Size GetPreferredSize() const OVERRIDE; 173 virtual gfx::Size GetPreferredSize() const override;
174 virtual gfx::Size GetMinimumSize() const OVERRIDE; 174 virtual gfx::Size GetMinimumSize() const override;
175 virtual bool CanProcessEventsWithinSubtree() const OVERRIDE; 175 virtual bool CanProcessEventsWithinSubtree() const override;
176 virtual void Layout() OVERRIDE; 176 virtual void Layout() override;
177 virtual void ViewHierarchyChanged( 177 virtual void ViewHierarchyChanged(
178 const ViewHierarchyChangedDetails& details) OVERRIDE; 178 const ViewHierarchyChangedDetails& details) override;
179 virtual void PaintChildren(gfx::Canvas* canvas, 179 virtual void PaintChildren(gfx::Canvas* canvas,
180 const views::CullSet& cull_set) OVERRIDE; 180 const views::CullSet& cull_set) override;
181 virtual bool GetDropFormats( 181 virtual bool GetDropFormats(
182 int* formats, 182 int* formats,
183 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; 183 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) override;
184 virtual bool AreDropTypesRequired() OVERRIDE; 184 virtual bool AreDropTypesRequired() override;
185 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE; 185 virtual bool CanDrop(const ui::OSExchangeData& data) override;
186 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; 186 virtual void OnDragEntered(const ui::DropTargetEvent& event) override;
187 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; 187 virtual int OnDragUpdated(const ui::DropTargetEvent& event) override;
188 virtual void OnDragExited() OVERRIDE; 188 virtual void OnDragExited() override;
189 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; 189 virtual int OnPerformDrop(const ui::DropTargetEvent& event) override;
190 virtual void OnThemeChanged() OVERRIDE; 190 virtual void OnThemeChanged() override;
191 virtual const char* GetClassName() const OVERRIDE; 191 virtual const char* GetClassName() const override;
192 virtual void SetVisible(bool visible) OVERRIDE; 192 virtual void SetVisible(bool visible) override;
193 193
194 // AccessiblePaneView: 194 // AccessiblePaneView:
195 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 195 virtual void GetAccessibleState(ui::AXViewState* state) override;
196 196
197 // gfx::AnimationDelegate: 197 // gfx::AnimationDelegate:
198 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 198 virtual void AnimationProgressed(const gfx::Animation* animation) override;
199 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; 199 virtual void AnimationEnded(const gfx::Animation* animation) override;
200 200
201 // BookmarkMenuControllerObserver: 201 // BookmarkMenuControllerObserver:
202 virtual void BookmarkMenuControllerDeleted( 202 virtual void BookmarkMenuControllerDeleted(
203 BookmarkMenuController* controller) OVERRIDE; 203 BookmarkMenuController* controller) override;
204 204
205 // BookmarkBarInstructionsDelegate: 205 // BookmarkBarInstructionsDelegate:
206 virtual void ShowImportDialog() OVERRIDE; 206 virtual void ShowImportDialog() override;
207 207
208 // BookmarkBubbleViewObserver: 208 // BookmarkBubbleViewObserver:
209 virtual void OnBookmarkBubbleShown(const GURL& url) OVERRIDE; 209 virtual void OnBookmarkBubbleShown(const GURL& url) override;
210 virtual void OnBookmarkBubbleHidden() OVERRIDE; 210 virtual void OnBookmarkBubbleHidden() override;
211 211
212 // BookmarkModelObserver: 212 // BookmarkModelObserver:
213 virtual void BookmarkModelLoaded(BookmarkModel* model, 213 virtual void BookmarkModelLoaded(BookmarkModel* model,
214 bool ids_reassigned) OVERRIDE; 214 bool ids_reassigned) override;
215 virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE; 215 virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override;
216 virtual void BookmarkNodeMoved(BookmarkModel* model, 216 virtual void BookmarkNodeMoved(BookmarkModel* model,
217 const BookmarkNode* old_parent, 217 const BookmarkNode* old_parent,
218 int old_index, 218 int old_index,
219 const BookmarkNode* new_parent, 219 const BookmarkNode* new_parent,
220 int new_index) OVERRIDE; 220 int new_index) override;
221 virtual void BookmarkNodeAdded(BookmarkModel* model, 221 virtual void BookmarkNodeAdded(BookmarkModel* model,
222 const BookmarkNode* parent, 222 const BookmarkNode* parent,
223 int index) OVERRIDE; 223 int index) override;
224 virtual void BookmarkNodeRemoved(BookmarkModel* model, 224 virtual void BookmarkNodeRemoved(BookmarkModel* model,
225 const BookmarkNode* parent, 225 const BookmarkNode* parent,
226 int old_index, 226 int old_index,
227 const BookmarkNode* node, 227 const BookmarkNode* node,
228 const std::set<GURL>& removed_urls) OVERRIDE; 228 const std::set<GURL>& removed_urls) override;
229 virtual void BookmarkAllUserNodesRemoved( 229 virtual void BookmarkAllUserNodesRemoved(
230 BookmarkModel* model, 230 BookmarkModel* model,
231 const std::set<GURL>& removed_urls) OVERRIDE; 231 const std::set<GURL>& removed_urls) override;
232 virtual void BookmarkNodeChanged(BookmarkModel* model, 232 virtual void BookmarkNodeChanged(BookmarkModel* model,
233 const BookmarkNode* node) OVERRIDE; 233 const BookmarkNode* node) override;
234 virtual void BookmarkNodeChildrenReordered(BookmarkModel* model, 234 virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
235 const BookmarkNode* node) OVERRIDE; 235 const BookmarkNode* node) override;
236 virtual void BookmarkNodeFaviconChanged(BookmarkModel* model, 236 virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
237 const BookmarkNode* node) OVERRIDE; 237 const BookmarkNode* node) override;
238 238
239 // views::DragController: 239 // views::DragController:
240 virtual void WriteDragDataForView(views::View* sender, 240 virtual void WriteDragDataForView(views::View* sender,
241 const gfx::Point& press_pt, 241 const gfx::Point& press_pt,
242 ui::OSExchangeData* data) OVERRIDE; 242 ui::OSExchangeData* data) override;
243 virtual int GetDragOperationsForView(views::View* sender, 243 virtual int GetDragOperationsForView(views::View* sender,
244 const gfx::Point& p) OVERRIDE; 244 const gfx::Point& p) override;
245 virtual bool CanStartDragForView(views::View* sender, 245 virtual bool CanStartDragForView(views::View* sender,
246 const gfx::Point& press_pt, 246 const gfx::Point& press_pt,
247 const gfx::Point& p) OVERRIDE; 247 const gfx::Point& p) override;
248 248
249 // views::MenuButtonListener: 249 // views::MenuButtonListener:
250 virtual void OnMenuButtonClicked(views::View* view, 250 virtual void OnMenuButtonClicked(views::View* view,
251 const gfx::Point& point) OVERRIDE; 251 const gfx::Point& point) override;
252 252
253 // views::ButtonListener: 253 // views::ButtonListener:
254 virtual void ButtonPressed(views::Button* sender, 254 virtual void ButtonPressed(views::Button* sender,
255 const ui::Event& event) OVERRIDE; 255 const ui::Event& event) override;
256 256
257 // views::ContextMenuController: 257 // views::ContextMenuController:
258 virtual void ShowContextMenuForView(views::View* source, 258 virtual void ShowContextMenuForView(views::View* source,
259 const gfx::Point& point, 259 const gfx::Point& point,
260 ui::MenuSourceType source_type) OVERRIDE; 260 ui::MenuSourceType source_type) override;
261 261
262 private: 262 private:
263 class ButtonSeparatorView; 263 class ButtonSeparatorView;
264 struct DropInfo; 264 struct DropInfo;
265 struct DropLocation; 265 struct DropLocation;
266 266
267 friend class BookmarkBarViewEventTestBase; 267 friend class BookmarkBarViewEventTestBase;
268 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, SwitchProfile); 268 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, SwitchProfile);
269 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, 269 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest,
270 ManagedShowAppsShortcutInBookmarksBar); 270 ManagedShowAppsShortcutInBookmarksBar);
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 453
454 ObserverList<BookmarkBarViewObserver> observers_; 454 ObserverList<BookmarkBarViewObserver> observers_;
455 455
456 // Factory used to delay showing of the drop menu. 456 // Factory used to delay showing of the drop menu.
457 base::WeakPtrFactory<BookmarkBarView> show_folder_method_factory_; 457 base::WeakPtrFactory<BookmarkBarView> show_folder_method_factory_;
458 458
459 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); 459 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
460 }; 460 };
461 461
462 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 462 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698