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

Side by Side Diff: chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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_BOOKMARKS_RECENTLY_USED_FOLDERS_COMBO_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_BOOKMARKS_RECENTLY_USED_FOLDERS_COMBO_MODEL_H_
6 #define CHROME_BROWSER_UI_BOOKMARKS_RECENTLY_USED_FOLDERS_COMBO_MODEL_H_ 6 #define CHROME_BROWSER_UI_BOOKMARKS_RECENTLY_USED_FOLDERS_COMBO_MODEL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/observer_list.h" 12 #include "base/observer_list.h"
13 #include "components/bookmarks/browser/bookmark_model_observer.h" 13 #include "components/bookmarks/browser/bookmark_model_observer.h"
14 #include "ui/base/models/combobox_model.h" 14 #include "ui/base/models/combobox_model.h"
15 15
16 class BookmarkModel; 16 class BookmarkModel;
17 class BookmarkNode; 17 class BookmarkNode;
18 18
19 // Model for the combobox showing the list of folders to choose from. The 19 // Model for the combobox showing the list of folders to choose from. The
20 // list always contains the Bookmarks Bar, Other Bookmarks and the parent 20 // list always contains the Bookmarks Bar, Other Bookmarks and the parent
21 // folder. The list also contains an extra item that shows the text 21 // folder. The list also contains an extra item that shows the text
22 // "Choose Another Folder...". 22 // "Choose Another Folder...".
23 class RecentlyUsedFoldersComboModel : public ui::ComboboxModel, 23 class RecentlyUsedFoldersComboModel : public ui::ComboboxModel,
24 public BookmarkModelObserver { 24 public BookmarkModelObserver {
25 public: 25 public:
26 RecentlyUsedFoldersComboModel(BookmarkModel* model, const BookmarkNode* node); 26 RecentlyUsedFoldersComboModel(BookmarkModel* model, const BookmarkNode* node);
27 virtual ~RecentlyUsedFoldersComboModel(); 27 virtual ~RecentlyUsedFoldersComboModel();
28 28
29 // Overridden from ui::ComboboxModel: 29 // Overridden from ui::ComboboxModel:
30 virtual int GetItemCount() const OVERRIDE; 30 virtual int GetItemCount() const override;
31 virtual base::string16 GetItemAt(int index) OVERRIDE; 31 virtual base::string16 GetItemAt(int index) override;
32 virtual bool IsItemSeparatorAt(int index) OVERRIDE; 32 virtual bool IsItemSeparatorAt(int index) override;
33 virtual int GetDefaultIndex() const OVERRIDE; 33 virtual int GetDefaultIndex() const override;
34 virtual void AddObserver(ui::ComboboxModelObserver* observer) OVERRIDE; 34 virtual void AddObserver(ui::ComboboxModelObserver* observer) override;
35 virtual void RemoveObserver(ui::ComboboxModelObserver* observer) OVERRIDE; 35 virtual void RemoveObserver(ui::ComboboxModelObserver* observer) override;
36 36
37 // Overriden from BookmarkModelObserver: 37 // Overriden from BookmarkModelObserver:
38 virtual void BookmarkModelLoaded(BookmarkModel* model, 38 virtual void BookmarkModelLoaded(BookmarkModel* model,
39 bool ids_reassigned) OVERRIDE; 39 bool ids_reassigned) override;
40 virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE; 40 virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override;
41 virtual void BookmarkNodeMoved(BookmarkModel* model, 41 virtual void BookmarkNodeMoved(BookmarkModel* model,
42 const BookmarkNode* old_parent, 42 const BookmarkNode* old_parent,
43 int old_index, 43 int old_index,
44 const BookmarkNode* new_parent, 44 const BookmarkNode* new_parent,
45 int new_index) OVERRIDE; 45 int new_index) override;
46 virtual void BookmarkNodeAdded(BookmarkModel* model, 46 virtual void BookmarkNodeAdded(BookmarkModel* model,
47 const BookmarkNode* parent, 47 const BookmarkNode* parent,
48 int index) OVERRIDE; 48 int index) override;
49 virtual void OnWillRemoveBookmarks(BookmarkModel* model, 49 virtual void OnWillRemoveBookmarks(BookmarkModel* model,
50 const BookmarkNode* parent, 50 const BookmarkNode* parent,
51 int old_index, 51 int old_index,
52 const BookmarkNode* node) OVERRIDE; 52 const BookmarkNode* node) override;
53 virtual void BookmarkNodeRemoved(BookmarkModel* model, 53 virtual void BookmarkNodeRemoved(BookmarkModel* model,
54 const BookmarkNode* parent, 54 const BookmarkNode* parent,
55 int old_index, 55 int old_index,
56 const BookmarkNode* node, 56 const BookmarkNode* node,
57 const std::set<GURL>& removed_urls) OVERRIDE; 57 const std::set<GURL>& removed_urls) override;
58 virtual void BookmarkNodeChanged(BookmarkModel* model, 58 virtual void BookmarkNodeChanged(BookmarkModel* model,
59 const BookmarkNode* node) OVERRIDE; 59 const BookmarkNode* node) override;
60 virtual void BookmarkNodeFaviconChanged(BookmarkModel* model, 60 virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
61 const BookmarkNode* node) OVERRIDE; 61 const BookmarkNode* node) override;
62 virtual void BookmarkNodeChildrenReordered( 62 virtual void BookmarkNodeChildrenReordered(
63 BookmarkModel* model, 63 BookmarkModel* model,
64 const BookmarkNode* node) OVERRIDE; 64 const BookmarkNode* node) override;
65 virtual void BookmarkAllUserNodesRemoved( 65 virtual void BookmarkAllUserNodesRemoved(
66 BookmarkModel* model, 66 BookmarkModel* model,
67 const std::set<GURL>& removed_urls) OVERRIDE; 67 const std::set<GURL>& removed_urls) override;
68 68
69 // If necessary this function moves |node| into the corresponding folder for 69 // If necessary this function moves |node| into the corresponding folder for
70 // the given |selected_index|. 70 // the given |selected_index|.
71 void MaybeChangeParent(const BookmarkNode* node, int selected_index); 71 void MaybeChangeParent(const BookmarkNode* node, int selected_index);
72 72
73 private: 73 private:
74 // Returns the node at the specified |index|. 74 // Returns the node at the specified |index|.
75 const BookmarkNode* GetNodeAt(int index); 75 const BookmarkNode* GetNodeAt(int index);
76 76
77 // Removes |node| from |items_|. Does nothing if |node| is not in |items_|. 77 // Removes |node| from |items_|. Does nothing if |node| is not in |items_|.
78 void RemoveNode(const BookmarkNode* node); 78 void RemoveNode(const BookmarkNode* node);
79 79
80 struct Item; 80 struct Item;
81 std::vector<Item> items_; 81 std::vector<Item> items_;
82 82
83 BookmarkModel* bookmark_model_; 83 BookmarkModel* bookmark_model_;
84 84
85 // The index of the original parent folder. 85 // The index of the original parent folder.
86 int node_parent_index_; 86 int node_parent_index_;
87 87
88 ObserverList<ui::ComboboxModelObserver> observers_; 88 ObserverList<ui::ComboboxModelObserver> observers_;
89 89
90 DISALLOW_COPY_AND_ASSIGN(RecentlyUsedFoldersComboModel); 90 DISALLOW_COPY_AND_ASSIGN(RecentlyUsedFoldersComboModel);
91 }; 91 };
92 92
93 #endif // CHROME_BROWSER_UI_BOOKMARKS_RECENTLY_USED_FOLDERS_COMBO_MODEL_H_ 93 #endif // CHROME_BROWSER_UI_BOOKMARKS_RECENTLY_USED_FOLDERS_COMBO_MODEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698