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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controlle r.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controlle r.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h" 10 #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
13 #include "components/bookmarks/browser/bookmark_model.h" 13 #include "components/bookmarks/browser/bookmark_model.h"
14 #import "ui/base/cocoa/menu_controller.h" 14 #import "ui/base/cocoa/menu_controller.h"
15 15
16 @interface BookmarkContextMenuCocoaController (Private) 16 @interface BookmarkContextMenuCocoaController (Private)
17 - (void)willExecuteCommand:(int)command; 17 - (void)willExecuteCommand:(int)command;
18 @end 18 @end
19 19
20 class BookmarkContextMenuDelegateBridge : 20 class BookmarkContextMenuDelegateBridge :
21 public BookmarkContextMenuControllerDelegate { 21 public BookmarkContextMenuControllerDelegate {
22 public: 22 public:
23 BookmarkContextMenuDelegateBridge( 23 BookmarkContextMenuDelegateBridge(
24 BookmarkContextMenuCocoaController* controller) 24 BookmarkContextMenuCocoaController* controller)
25 : controller_(controller) { 25 : controller_(controller) {
26 } 26 }
27 27
28 virtual ~BookmarkContextMenuDelegateBridge() { 28 ~BookmarkContextMenuDelegateBridge() override {}
29 }
30 29
31 virtual void CloseMenu() override { 30 void CloseMenu() override { [controller_ cancelTracking]; }
32 [controller_ cancelTracking];
33 }
34 31
35 virtual void WillExecuteCommand( 32 void WillExecuteCommand(
36 int command_id, 33 int command_id,
37 const std::vector<const BookmarkNode*>& bookmarks) override { 34 const std::vector<const BookmarkNode*>& bookmarks) override {
38 [controller_ willExecuteCommand:command_id]; 35 [controller_ willExecuteCommand:command_id];
39 } 36 }
40 37
41 private: 38 private:
42 BookmarkContextMenuCocoaController* controller_; // Weak; owns us. 39 BookmarkContextMenuCocoaController* controller_; // Weak; owns us.
43 40
44 DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenuDelegateBridge); 41 DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenuDelegateBridge);
45 }; 42 };
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 [bookmarkBarController_ closeFolderAndStopTrackingMenus]; 125 [bookmarkBarController_ closeFolderAndStopTrackingMenus];
129 if (bookmarkNode_) 126 if (bookmarkNode_)
130 [bookmarkBarController_ unhighlightBookmark:bookmarkNode_]; 127 [bookmarkBarController_ unhighlightBookmark:bookmarkNode_];
131 } 128 }
132 129
133 - (void)cancelTracking { 130 - (void)cancelTracking {
134 [[menuController_ menu] cancelTracking]; 131 [[menuController_ menu] cancelTracking];
135 } 132 }
136 133
137 @end 134 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698