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

Side by Side Diff: chrome/browser/profile_resetter/profile_resetter.h

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 #ifndef CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_H_ 5 #ifndef CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_H_
6 #define CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_H_ 6 #define CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 void ResetDefaultSearchEngine(); 77 void ResetDefaultSearchEngine();
78 void ResetHomepage(); 78 void ResetHomepage();
79 void ResetContentSettings(); 79 void ResetContentSettings();
80 void ResetCookiesAndSiteData(); 80 void ResetCookiesAndSiteData();
81 void ResetExtensions(); 81 void ResetExtensions();
82 void ResetStartupPages(); 82 void ResetStartupPages();
83 void ResetPinnedTabs(); 83 void ResetPinnedTabs();
84 void ResetShortcuts(); 84 void ResetShortcuts();
85 85
86 // BrowsingDataRemover::Observer: 86 // BrowsingDataRemover::Observer:
87 virtual void OnBrowsingDataRemoverDone() OVERRIDE; 87 virtual void OnBrowsingDataRemoverDone() override;
88 88
89 // Callback for when TemplateURLService has loaded. 89 // Callback for when TemplateURLService has loaded.
90 void OnTemplateURLServiceLoaded(); 90 void OnTemplateURLServiceLoaded();
91 91
92 Profile* const profile_; 92 Profile* const profile_;
93 scoped_ptr<BrandcodedDefaultSettings> master_settings_; 93 scoped_ptr<BrandcodedDefaultSettings> master_settings_;
94 TemplateURLService* template_url_service_; 94 TemplateURLService* template_url_service_;
95 95
96 // Flags of a Resetable indicating which reset operations we are still waiting 96 // Flags of a Resetable indicating which reset operations we are still waiting
97 // for. 97 // for.
(...skipping 18 matching lines...) Expand all
116 116
117 typedef base::RefCountedData<base::CancellationFlag> SharedCancellationFlag; 117 typedef base::RefCountedData<base::CancellationFlag> SharedCancellationFlag;
118 118
119 // On Windows returns all the shortcuts which launch Chrome and corresponding 119 // On Windows returns all the shortcuts which launch Chrome and corresponding
120 // arguments. |cancel| can be passed to abort the operation earlier. 120 // arguments. |cancel| can be passed to abort the operation earlier.
121 // Call on FILE thread. 121 // Call on FILE thread.
122 std::vector<ShortcutCommand> GetChromeLaunchShortcuts( 122 std::vector<ShortcutCommand> GetChromeLaunchShortcuts(
123 const scoped_refptr<SharedCancellationFlag>& cancel); 123 const scoped_refptr<SharedCancellationFlag>& cancel);
124 124
125 #endif // CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_H_ 125 #endif // CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698