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

Side by Side Diff: content/browser/service_worker/service_worker_handle.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 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 CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_HANDLE_H_ 5 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_HANDLE_H_
6 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_HANDLE_H_ 6 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_HANDLE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 ServiceWorkerHandle(base::WeakPtr<ServiceWorkerContextCore> context, 46 ServiceWorkerHandle(base::WeakPtr<ServiceWorkerContextCore> context,
47 IPC::Sender* sender, 47 IPC::Sender* sender,
48 int thread_id, 48 int thread_id,
49 int provider_id, 49 int provider_id,
50 ServiceWorkerRegistration* registration, 50 ServiceWorkerRegistration* registration,
51 ServiceWorkerVersion* version); 51 ServiceWorkerVersion* version);
52 virtual ~ServiceWorkerHandle(); 52 virtual ~ServiceWorkerHandle();
53 53
54 // ServiceWorkerVersion::Listener overrides. 54 // ServiceWorkerVersion::Listener overrides.
55 virtual void OnWorkerStarted(ServiceWorkerVersion* version) OVERRIDE; 55 virtual void OnWorkerStarted(ServiceWorkerVersion* version) override;
56 virtual void OnWorkerStopped(ServiceWorkerVersion* version) OVERRIDE; 56 virtual void OnWorkerStopped(ServiceWorkerVersion* version) override;
57 virtual void OnErrorReported(ServiceWorkerVersion* version, 57 virtual void OnErrorReported(ServiceWorkerVersion* version,
58 const base::string16& error_message, 58 const base::string16& error_message,
59 int line_number, 59 int line_number,
60 int column_number, 60 int column_number,
61 const GURL& source_url) OVERRIDE; 61 const GURL& source_url) override;
62 virtual void OnReportConsoleMessage(ServiceWorkerVersion* version, 62 virtual void OnReportConsoleMessage(ServiceWorkerVersion* version,
63 int source_identifier, 63 int source_identifier,
64 int message_level, 64 int message_level,
65 const base::string16& message, 65 const base::string16& message,
66 int line_number, 66 int line_number,
67 const GURL& source_url) OVERRIDE; 67 const GURL& source_url) override;
68 virtual void OnVersionStateChanged(ServiceWorkerVersion* version) OVERRIDE; 68 virtual void OnVersionStateChanged(ServiceWorkerVersion* version) override;
69 69
70 ServiceWorkerObjectInfo GetObjectInfo(); 70 ServiceWorkerObjectInfo GetObjectInfo();
71 71
72 int thread_id() const { return thread_id_; } 72 int thread_id() const { return thread_id_; }
73 int provider_id() const { return provider_id_; } 73 int provider_id() const { return provider_id_; }
74 int handle_id() const { return handle_id_; } 74 int handle_id() const { return handle_id_; }
75 ServiceWorkerRegistration* registration() { return registration_.get(); } 75 ServiceWorkerRegistration* registration() { return registration_.get(); }
76 ServiceWorkerVersion* version() { return version_.get(); } 76 ServiceWorkerVersion* version() { return version_.get(); }
77 77
78 bool HasNoRefCount() const { return ref_count_ <= 0; } 78 bool HasNoRefCount() const { return ref_count_ <= 0; }
79 void IncrementRefCount(); 79 void IncrementRefCount();
80 void DecrementRefCount(); 80 void DecrementRefCount();
81 81
82 private: 82 private:
83 base::WeakPtr<ServiceWorkerContextCore> context_; 83 base::WeakPtr<ServiceWorkerContextCore> context_;
84 IPC::Sender* sender_; // Not owned, it should always outlive this. 84 IPC::Sender* sender_; // Not owned, it should always outlive this.
85 const int thread_id_; 85 const int thread_id_;
86 const int provider_id_; 86 const int provider_id_;
87 const int handle_id_; 87 const int handle_id_;
88 int ref_count_; // Created with 1. 88 int ref_count_; // Created with 1.
89 scoped_refptr<ServiceWorkerRegistration> registration_; 89 scoped_refptr<ServiceWorkerRegistration> registration_;
90 scoped_refptr<ServiceWorkerVersion> version_; 90 scoped_refptr<ServiceWorkerVersion> version_;
91 91
92 DISALLOW_COPY_AND_ASSIGN(ServiceWorkerHandle); 92 DISALLOW_COPY_AND_ASSIGN(ServiceWorkerHandle);
93 }; 93 };
94 94
95 } // namespace content 95 } // namespace content
96 96
97 #endif // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_HANDLE_H_ 97 #endif // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_HANDLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698