| Index: chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
|
| diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
|
| index 5a4eeb39c46491d9c892b19e7c3fa1ca4de38b7d..ac56344cafcc53f6b2af61a5655cd42d018e645d 100644
|
| --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
|
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
|
| @@ -63,8 +63,8 @@ class BookmarkEditorView : public BookmarkEditor,
|
| explicit EditorTreeModel(EditorNode* root)
|
| : ui::TreeNodeModel<EditorNode>(root) {}
|
|
|
| - virtual void SetTitle(ui::TreeModelNode* node,
|
| - const base::string16& title) override;
|
| + void SetTitle(ui::TreeModelNode* node,
|
| + const base::string16& title) override;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(EditorTreeModel);
|
| @@ -75,53 +75,49 @@ class BookmarkEditorView : public BookmarkEditor,
|
| const EditDetails& details,
|
| BookmarkEditor::Configuration configuration);
|
|
|
| - virtual ~BookmarkEditorView();
|
| + ~BookmarkEditorView() override;
|
|
|
| // views::DialogDelegateView:
|
| - virtual base::string16 GetDialogButtonLabel(
|
| - ui::DialogButton button) const override;
|
| - virtual bool IsDialogButtonEnabled(ui::DialogButton button) const override;
|
| - virtual views::View* CreateExtraView() override;
|
| - virtual ui::ModalType GetModalType() const override;
|
| - virtual bool CanResize() const override;
|
| - virtual base::string16 GetWindowTitle() const override;
|
| - virtual bool Accept() override;
|
| + base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
|
| + bool IsDialogButtonEnabled(ui::DialogButton button) const override;
|
| + views::View* CreateExtraView() override;
|
| + ui::ModalType GetModalType() const override;
|
| + bool CanResize() const override;
|
| + base::string16 GetWindowTitle() const override;
|
| + bool Accept() override;
|
|
|
| // views::View:
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| - virtual void GetAccessibleState(ui::AXViewState* state) override;
|
| + gfx::Size GetPreferredSize() const override;
|
| + void GetAccessibleState(ui::AXViewState* state) override;
|
|
|
| // views::TreeViewController:
|
| - virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view) override;
|
| - virtual bool CanEdit(views::TreeView* tree_view,
|
| - ui::TreeModelNode* node) override;
|
| + void OnTreeViewSelectionChanged(views::TreeView* tree_view) override;
|
| + bool CanEdit(views::TreeView* tree_view, ui::TreeModelNode* node) override;
|
|
|
| // views::TextfieldController:
|
| - virtual void ContentsChanged(views::Textfield* sender,
|
| - const base::string16& new_contents) override;
|
| - virtual bool HandleKeyEvent(views::Textfield* sender,
|
| - const ui::KeyEvent& key_event) override;
|
| + void ContentsChanged(views::Textfield* sender,
|
| + const base::string16& new_contents) override;
|
| + bool HandleKeyEvent(views::Textfield* sender,
|
| + const ui::KeyEvent& key_event) override;
|
|
|
| // views::ButtonListener:
|
| - virtual void ButtonPressed(views::Button* sender,
|
| - const ui::Event& event) override;
|
| + void ButtonPressed(views::Button* sender, const ui::Event& event) override;
|
|
|
| // ui::SimpleMenuModel::Delegate:
|
| - virtual bool IsCommandIdChecked(int command_id) const override;
|
| - virtual bool IsCommandIdEnabled(int command_id) const override;
|
| - virtual bool GetAcceleratorForCommandId(
|
| - int command_id,
|
| - ui::Accelerator* accelerator) override;
|
| - virtual void ExecuteCommand(int command_id, int event_flags) override;
|
| + bool IsCommandIdChecked(int command_id) const override;
|
| + bool IsCommandIdEnabled(int command_id) const override;
|
| + bool GetAcceleratorForCommandId(int command_id,
|
| + ui::Accelerator* accelerator) override;
|
| + void ExecuteCommand(int command_id, int event_flags) override;
|
|
|
| // Creates a Window and adds the BookmarkEditorView to it. When the window is
|
| // closed the BookmarkEditorView is deleted.
|
| void Show(gfx::NativeWindow parent);
|
|
|
| // views::ContextMenuController:
|
| - virtual void ShowContextMenuForView(views::View* source,
|
| - const gfx::Point& point,
|
| - ui::MenuSourceType source_type) override;
|
| + void ShowContextMenuForView(views::View* source,
|
| + const gfx::Point& point,
|
| + ui::MenuSourceType source_type) override;
|
|
|
| private:
|
| friend class BookmarkEditorViewTest;
|
| @@ -132,30 +128,29 @@ class BookmarkEditorView : public BookmarkEditor,
|
|
|
| // BookmarkModel observer methods. Any structural change results in
|
| // resetting the tree model.
|
| - virtual void BookmarkModelLoaded(BookmarkModel* model,
|
| - bool ids_reassigned) override {}
|
| - virtual void BookmarkNodeMoved(BookmarkModel* model,
|
| - const BookmarkNode* old_parent,
|
| - int old_index,
|
| - const BookmarkNode* new_parent,
|
| - int new_index) override;
|
| - virtual void BookmarkNodeAdded(BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int index) override;
|
| - virtual void BookmarkNodeRemoved(BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int index,
|
| - const BookmarkNode* node,
|
| + void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override {
|
| + }
|
| + void BookmarkNodeMoved(BookmarkModel* model,
|
| + const BookmarkNode* old_parent,
|
| + int old_index,
|
| + const BookmarkNode* new_parent,
|
| + int new_index) override;
|
| + void BookmarkNodeAdded(BookmarkModel* model,
|
| + const BookmarkNode* parent,
|
| + int index) override;
|
| + void BookmarkNodeRemoved(BookmarkModel* model,
|
| + const BookmarkNode* parent,
|
| + int index,
|
| + const BookmarkNode* node,
|
| + const std::set<GURL>& removed_urls) override;
|
| + void BookmarkAllUserNodesRemoved(BookmarkModel* model,
|
| const std::set<GURL>& removed_urls) override;
|
| - virtual void BookmarkAllUserNodesRemoved(
|
| - BookmarkModel* model,
|
| - const std::set<GURL>& removed_urls) override;
|
| - virtual void BookmarkNodeChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) override {}
|
| - virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| - virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) override {}
|
| + void BookmarkNodeChanged(BookmarkModel* model,
|
| + const BookmarkNode* node) override {}
|
| + void BookmarkNodeChildrenReordered(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
| + void BookmarkNodeFaviconChanged(BookmarkModel* model,
|
| + const BookmarkNode* node) override {}
|
|
|
| // Resets the model of the tree and updates the various buttons appropriately.
|
| void Reset();
|
|
|