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

Side by Side Diff: chrome/browser/history/history_service.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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
« no previous file with comments | « chrome/browser/history/history_database.h ('k') | chrome/browser/history/history_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_HISTORY_HISTORY_SERVICE_H_ 5 #ifndef CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_
6 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_ 6 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 // This method should only be called from the history thread, because the 144 // This method should only be called from the history thread, because the
145 // returned service is intended to be accessed only via the history thread. 145 // returned service is intended to be accessed only via the history thread.
146 history::TypedUrlSyncableService* GetTypedUrlSyncableService() const; 146 history::TypedUrlSyncableService* GetTypedUrlSyncableService() const;
147 147
148 // Return the quick history index. 148 // Return the quick history index.
149 history::InMemoryURLIndex* InMemoryIndex() const { 149 history::InMemoryURLIndex* InMemoryIndex() const {
150 return in_memory_url_index_.get(); 150 return in_memory_url_index_.get();
151 } 151 }
152 152
153 // KeyedService: 153 // KeyedService:
154 virtual void Shutdown() OVERRIDE; 154 virtual void Shutdown() override;
155 155
156 // Navigation ---------------------------------------------------------------- 156 // Navigation ----------------------------------------------------------------
157 157
158 // Adds the given canonical URL to history with the given time as the visit 158 // Adds the given canonical URL to history with the given time as the visit
159 // time. Referrer may be the empty string. 159 // time. Referrer may be the empty string.
160 // 160 //
161 // The supplied context id is used to scope the given page ID. Page IDs 161 // The supplied context id is used to scope the given page ID. Page IDs
162 // are only unique inside a given context, so we need that to differentiate 162 // are only unique inside a given context, so we need that to differentiate
163 // them. 163 // them.
164 // 164 //
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 // Returns the HistoryClient. 499 // Returns the HistoryClient.
500 history::HistoryClient* history_client() { return history_client_; } 500 history::HistoryClient* history_client() { return history_client_; }
501 501
502 base::WeakPtr<HistoryService> AsWeakPtr(); 502 base::WeakPtr<HistoryService> AsWeakPtr();
503 503
504 // syncer::SyncableService implementation. 504 // syncer::SyncableService implementation.
505 virtual syncer::SyncMergeResult MergeDataAndStartSyncing( 505 virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
506 syncer::ModelType type, 506 syncer::ModelType type,
507 const syncer::SyncDataList& initial_sync_data, 507 const syncer::SyncDataList& initial_sync_data,
508 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, 508 scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
509 scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE; 509 scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
510 virtual void StopSyncing(syncer::ModelType type) OVERRIDE; 510 virtual void StopSyncing(syncer::ModelType type) override;
511 virtual syncer::SyncDataList GetAllSyncData( 511 virtual syncer::SyncDataList GetAllSyncData(
512 syncer::ModelType type) const OVERRIDE; 512 syncer::ModelType type) const override;
513 virtual syncer::SyncError ProcessSyncChanges( 513 virtual syncer::SyncError ProcessSyncChanges(
514 const tracked_objects::Location& from_here, 514 const tracked_objects::Location& from_here,
515 const syncer::SyncChangeList& change_list) OVERRIDE; 515 const syncer::SyncChangeList& change_list) override;
516 516
517 protected: 517 protected:
518 // These are not currently used, hopefully we can do something in the future 518 // These are not currently used, hopefully we can do something in the future
519 // to ensure that the most important things happen first. 519 // to ensure that the most important things happen first.
520 enum SchedulePriority { 520 enum SchedulePriority {
521 PRIORITY_UI, // The highest priority (must respond to UI events). 521 PRIORITY_UI, // The highest priority (must respond to UI events).
522 PRIORITY_NORMAL, // Normal stuff like adding a page. 522 PRIORITY_NORMAL, // Normal stuff like adding a page.
523 PRIORITY_LOW, // Low priority things like indexing or expiration. 523 PRIORITY_LOW, // Low priority things like indexing or expiration.
524 }; 524 };
525 525
(...skipping 25 matching lines...) Expand all
551 // 551 //
552 // In practice, this will be called by the service manager (BrowserProcess) 552 // In practice, this will be called by the service manager (BrowserProcess)
553 // when it is being destroyed. Because that reference is being destroyed, it 553 // when it is being destroyed. Because that reference is being destroyed, it
554 // should be impossible for anybody else to call the service, even if it is 554 // should be impossible for anybody else to call the service, even if it is
555 // still in memory (pending requests may be holding a reference to us). 555 // still in memory (pending requests may be holding a reference to us).
556 void Cleanup(); 556 void Cleanup();
557 557
558 // Implementation of content::NotificationObserver. 558 // Implementation of content::NotificationObserver.
559 virtual void Observe(int type, 559 virtual void Observe(int type,
560 const content::NotificationSource& source, 560 const content::NotificationSource& source,
561 const content::NotificationDetails& details) OVERRIDE; 561 const content::NotificationDetails& details) override;
562 562
563 // Implementation of visitedlink::VisitedLinkDelegate. 563 // Implementation of visitedlink::VisitedLinkDelegate.
564 virtual void RebuildTable( 564 virtual void RebuildTable(
565 const scoped_refptr<URLEnumerator>& enumerator) OVERRIDE; 565 const scoped_refptr<URLEnumerator>& enumerator) override;
566 566
567 // Low-level Init(). Same as the public version, but adds a |no_db| parameter 567 // Low-level Init(). Same as the public version, but adds a |no_db| parameter
568 // that is only set by unittests which causes the backend to not init its DB. 568 // that is only set by unittests which causes the backend to not init its DB.
569 bool Init(const base::FilePath& history_dir, bool no_db); 569 bool Init(const base::FilePath& history_dir, bool no_db);
570 570
571 // Called by the HistoryURLProvider class to schedule an autocomplete, it 571 // Called by the HistoryURLProvider class to schedule an autocomplete, it
572 // will be called back on the internal history thread with the history 572 // will be called back on the internal history thread with the history
573 // database so it can query. See history_autocomplete.cc for a diagram. 573 // database so it can query. See history_autocomplete.cc for a diagram.
574 void ScheduleAutocomplete(const base::Callback< 574 void ScheduleAutocomplete(const base::Callback<
575 void(history::HistoryBackend*, history::URLDatabase*)>& callback); 575 void(history::HistoryBackend*, history::URLDatabase*)>& callback);
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 880
881 history::DeleteDirectiveHandler delete_directive_handler_; 881 history::DeleteDirectiveHandler delete_directive_handler_;
882 882
883 // All vended weak pointers are invalidated in Cleanup(). 883 // All vended weak pointers are invalidated in Cleanup().
884 base::WeakPtrFactory<HistoryService> weak_ptr_factory_; 884 base::WeakPtrFactory<HistoryService> weak_ptr_factory_;
885 885
886 DISALLOW_COPY_AND_ASSIGN(HistoryService); 886 DISALLOW_COPY_AND_ASSIGN(HistoryService);
887 }; 887 };
888 888
889 #endif // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_ 889 #endif // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/history/history_database.h ('k') | chrome/browser/history/history_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698