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

Side by Side Diff: content/browser/service_worker/service_worker_version.h

Issue 637183002: Replace FINAL and OVERRIDE with their C++11 counterparts in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_ 5 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_
6 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_ 6 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 ActivateWaitingVersion); 225 ActivateWaitingVersion);
226 FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest, ScheduleStopWorker); 226 FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest, ScheduleStopWorker);
227 FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest, ListenerAvailability); 227 FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest, ListenerAvailability);
228 typedef ServiceWorkerVersion self; 228 typedef ServiceWorkerVersion self;
229 typedef std::map<ServiceWorkerProviderHost*, int> ControlleeMap; 229 typedef std::map<ServiceWorkerProviderHost*, int> ControlleeMap;
230 typedef IDMap<ServiceWorkerProviderHost> ControlleeByIDMap; 230 typedef IDMap<ServiceWorkerProviderHost> ControlleeByIDMap;
231 231
232 virtual ~ServiceWorkerVersion(); 232 virtual ~ServiceWorkerVersion();
233 233
234 // EmbeddedWorkerInstance::Listener overrides: 234 // EmbeddedWorkerInstance::Listener overrides:
235 virtual void OnStarted() OVERRIDE; 235 virtual void OnStarted() override;
236 virtual void OnStopped() OVERRIDE; 236 virtual void OnStopped() override;
237 virtual void OnReportException(const base::string16& error_message, 237 virtual void OnReportException(const base::string16& error_message,
238 int line_number, 238 int line_number,
239 int column_number, 239 int column_number,
240 const GURL& source_url) OVERRIDE; 240 const GURL& source_url) override;
241 virtual void OnReportConsoleMessage(int source_identifier, 241 virtual void OnReportConsoleMessage(int source_identifier,
242 int message_level, 242 int message_level,
243 const base::string16& message, 243 const base::string16& message,
244 int line_number, 244 int line_number,
245 const GURL& source_url) OVERRIDE; 245 const GURL& source_url) override;
246 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 246 virtual bool OnMessageReceived(const IPC::Message& message) override;
247 247
248 void OnStartMessageSent(ServiceWorkerStatusCode status); 248 void OnStartMessageSent(ServiceWorkerStatusCode status);
249 249
250 void DispatchInstallEventAfterStartWorker(int active_version_id, 250 void DispatchInstallEventAfterStartWorker(int active_version_id,
251 const StatusCallback& callback); 251 const StatusCallback& callback);
252 void DispatchActivateEventAfterStartWorker(const StatusCallback& callback); 252 void DispatchActivateEventAfterStartWorker(const StatusCallback& callback);
253 253
254 // Message handlers. 254 // Message handlers.
255 void OnGetClientDocuments(int request_id); 255 void OnGetClientDocuments(int request_id);
256 void OnActivateEventFinished(int request_id, 256 void OnActivateEventFinished(int request_id,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 bool is_doomed_; 297 bool is_doomed_;
298 298
299 base::WeakPtrFactory<ServiceWorkerVersion> weak_factory_; 299 base::WeakPtrFactory<ServiceWorkerVersion> weak_factory_;
300 300
301 DISALLOW_COPY_AND_ASSIGN(ServiceWorkerVersion); 301 DISALLOW_COPY_AND_ASSIGN(ServiceWorkerVersion);
302 }; 302 };
303 303
304 } // namespace content 304 } // namespace content
305 305
306 #endif // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_ 306 #endif // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698