OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "content/common/service_worker/service_worker_client_info.h" | 5 #include "content/common/service_worker/service_worker_client_info.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/common/service_worker/service_worker_types.h" | 8 #include "content/common/service_worker/service_worker_types.h" |
9 | 9 |
10 namespace content { | 10 namespace content { |
11 | 11 |
12 ServiceWorkerClientInfo::ServiceWorkerClientInfo() | 12 ServiceWorkerClientInfo::ServiceWorkerClientInfo() |
13 : page_visibility_state(blink::WebPageVisibilityStateLast), | 13 : client_uuid(std::string()), |
14 page_visibility_state(blink::WebPageVisibilityStateLast), | |
14 is_focused(false), | 15 is_focused(false), |
15 frame_type(REQUEST_CONTEXT_FRAME_TYPE_LAST), | 16 frame_type(REQUEST_CONTEXT_FRAME_TYPE_LAST), |
16 client_type(blink::WebServiceWorkerClientTypeLast), | 17 client_type(blink::WebServiceWorkerClientTypeLast), |
17 last_focus_time(base::TimeTicks()) {} | 18 last_focus_time(base::TimeTicks()) {} |
nhiroki
2016/02/03 09:39:59
Generally, having multiple ctors is not so good be
jungkees
2016/02/03 14:15:07
Thanks for the information and the pointer! Done.
| |
18 | 19 |
19 ServiceWorkerClientInfo::ServiceWorkerClientInfo( | 20 ServiceWorkerClientInfo::ServiceWorkerClientInfo( |
21 const std::string& client_uuid, | |
20 blink::WebPageVisibilityState page_visibility_state, | 22 blink::WebPageVisibilityState page_visibility_state, |
21 bool is_focused, | 23 bool is_focused, |
22 const GURL& url, | 24 const GURL& url, |
23 RequestContextFrameType frame_type, | 25 RequestContextFrameType frame_type, |
24 base::TimeTicks last_focus_time, | 26 base::TimeTicks last_focus_time, |
25 blink::WebServiceWorkerClientType client_type) | 27 blink::WebServiceWorkerClientType client_type) |
26 : page_visibility_state(page_visibility_state), | 28 : client_uuid(client_uuid), |
29 page_visibility_state(page_visibility_state), | |
27 is_focused(is_focused), | 30 is_focused(is_focused), |
28 url(url), | 31 url(url), |
29 frame_type(frame_type), | 32 frame_type(frame_type), |
30 client_type(client_type), | 33 client_type(client_type), |
31 last_focus_time(last_focus_time) {} | 34 last_focus_time(last_focus_time) {} |
32 | 35 |
33 bool ServiceWorkerClientInfo::IsEmpty() const { | 36 bool ServiceWorkerClientInfo::IsEmpty() const { |
34 return page_visibility_state == blink::WebPageVisibilityStateLast && | 37 return page_visibility_state == blink::WebPageVisibilityStateLast && |
35 is_focused == false && | 38 is_focused == false && |
36 url.is_empty() && | 39 url.is_empty() && |
37 frame_type == REQUEST_CONTEXT_FRAME_TYPE_LAST && | 40 frame_type == REQUEST_CONTEXT_FRAME_TYPE_LAST && |
38 client_type == blink::WebServiceWorkerClientTypeLast; | 41 client_type == blink::WebServiceWorkerClientTypeLast; |
39 } | 42 } |
40 | 43 |
41 bool ServiceWorkerClientInfo::IsValid() const { | 44 bool ServiceWorkerClientInfo::IsValid() const { |
42 return !IsEmpty() && !client_uuid.empty(); | 45 return !IsEmpty() && !client_uuid.empty(); |
43 } | 46 } |
44 | 47 |
45 } // namespace content | 48 } // namespace content |
OLD | NEW |