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

Side by Side Diff: components/bookmarks/browser/bookmark_model.h

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_ 5 #ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
6 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_ 6 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 public: 60 public:
61 struct URLAndTitle { 61 struct URLAndTitle {
62 GURL url; 62 GURL url;
63 base::string16 title; 63 base::string16 title;
64 }; 64 };
65 65
66 explicit BookmarkModel(bookmarks::BookmarkClient* client); 66 explicit BookmarkModel(bookmarks::BookmarkClient* client);
67 virtual ~BookmarkModel(); 67 virtual ~BookmarkModel();
68 68
69 // KeyedService: 69 // KeyedService:
70 virtual void Shutdown() OVERRIDE; 70 virtual void Shutdown() override;
71 71
72 // Loads the bookmarks. This is called upon creation of the 72 // Loads the bookmarks. This is called upon creation of the
73 // BookmarkModel. You need not invoke this directly. 73 // BookmarkModel. You need not invoke this directly.
74 // All load operations will be executed on |io_task_runner| and the completion 74 // All load operations will be executed on |io_task_runner| and the completion
75 // callback will be called from |ui_task_runner|. 75 // callback will be called from |ui_task_runner|.
76 void Load(PrefService* pref_service, 76 void Load(PrefService* pref_service,
77 const std::string& accept_languages, 77 const std::string& accept_languages,
78 const base::FilePath& profile_path, 78 const base::FilePath& profile_path,
79 const scoped_refptr<base::SequencedTaskRunner>& io_task_runner, 79 const scoped_refptr<base::SequencedTaskRunner>& io_task_runner,
80 const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner); 80 const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner);
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 414
415 // See description of IsDoingExtensiveChanges above. 415 // See description of IsDoingExtensiveChanges above.
416 int extensive_changes_; 416 int extensive_changes_;
417 417
418 scoped_ptr<bookmarks::BookmarkExpandedStateTracker> expanded_state_tracker_; 418 scoped_ptr<bookmarks::BookmarkExpandedStateTracker> expanded_state_tracker_;
419 419
420 DISALLOW_COPY_AND_ASSIGN(BookmarkModel); 420 DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
421 }; 421 };
422 422
423 #endif // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_ 423 #endif // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
OLDNEW
« no previous file with comments | « components/bookmarks/browser/bookmark_index_unittest.cc ('k') | components/bookmarks/browser/bookmark_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698