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

Side by Side Diff: chrome/browser/search_engines/search_provider_install_data.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (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) 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 #include "chrome/browser/search_engines/search_provider_install_data.h" 5 #include "chrome/browser/search_engines/search_provider_install_data.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 base::Passed(template_url_copies.Pass()), 53 base::Passed(template_url_copies.Pass()),
54 base::Unretained(default_provider_copy))); 54 base::Unretained(default_provider_copy)));
55 } 55 }
56 56
57 // Implementation of SearchTermsData that may be used on the I/O thread. 57 // Implementation of SearchTermsData that may be used on the I/O thread.
58 class IOThreadSearchTermsData : public SearchTermsData { 58 class IOThreadSearchTermsData : public SearchTermsData {
59 public: 59 public:
60 explicit IOThreadSearchTermsData(const std::string& google_base_url); 60 explicit IOThreadSearchTermsData(const std::string& google_base_url);
61 61
62 // Implementation of SearchTermsData. 62 // Implementation of SearchTermsData.
63 virtual std::string GoogleBaseURLValue() const OVERRIDE; 63 virtual std::string GoogleBaseURLValue() const override;
64 64
65 private: 65 private:
66 std::string google_base_url_; 66 std::string google_base_url_;
67 67
68 DISALLOW_COPY_AND_ASSIGN(IOThreadSearchTermsData); 68 DISALLOW_COPY_AND_ASSIGN(IOThreadSearchTermsData);
69 }; 69 };
70 70
71 IOThreadSearchTermsData::IOThreadSearchTermsData( 71 IOThreadSearchTermsData::IOThreadSearchTermsData(
72 const std::string& google_base_url) : google_base_url_(google_base_url) { 72 const std::string& google_base_url) : google_base_url_(google_base_url) {
73 } 73 }
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // Notices changes in the Google base URL and sends them along 115 // Notices changes in the Google base URL and sends them along
116 // to the SearchProviderInstallData on the I/O thread. 116 // to the SearchProviderInstallData on the I/O thread.
117 class GoogleURLObserver : public content::RenderProcessHostObserver { 117 class GoogleURLObserver : public content::RenderProcessHostObserver {
118 public: 118 public:
119 GoogleURLObserver(GoogleURLTracker* google_url_tracker, 119 GoogleURLObserver(GoogleURLTracker* google_url_tracker,
120 GoogleURLChangeNotifier* change_notifier, 120 GoogleURLChangeNotifier* change_notifier,
121 content::RenderProcessHost* host); 121 content::RenderProcessHost* host);
122 122
123 // Implementation of content::RenderProcessHostObserver. 123 // Implementation of content::RenderProcessHostObserver.
124 virtual void RenderProcessHostDestroyed( 124 virtual void RenderProcessHostDestroyed(
125 content::RenderProcessHost* host) OVERRIDE; 125 content::RenderProcessHost* host) override;
126 126
127 private: 127 private:
128 virtual ~GoogleURLObserver() {} 128 virtual ~GoogleURLObserver() {}
129 129
130 // Callback that is called when the Google URL is updated. 130 // Callback that is called when the Google URL is updated.
131 void OnGoogleURLUpdated(); 131 void OnGoogleURLUpdated();
132 132
133 GoogleURLTracker* google_url_tracker_; 133 GoogleURLTracker* google_url_tracker_;
134 scoped_refptr<GoogleURLChangeNotifier> change_notifier_; 134 scoped_refptr<GoogleURLChangeNotifier> change_notifier_;
135 135
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 309
310 std::for_each(closure_queue.begin(), 310 std::for_each(closure_queue.begin(),
311 closure_queue.end(), 311 closure_queue.end(),
312 std::mem_fun_ref(&base::Closure::Run)); 312 std::mem_fun_ref(&base::Closure::Run));
313 313
314 // Since we expect this request to be rare, clear out the information. This 314 // Since we expect this request to be rare, clear out the information. This
315 // also keeps the responses current as the search providers change. 315 // also keeps the responses current as the search providers change.
316 provider_map_.reset(); 316 provider_map_.reset();
317 SetDefault(NULL); 317 SetDefault(NULL);
318 } 318 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698