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 "components/signin/ios/browser/account_consistency_service.h" | 5 #include "components/signin/ios/browser/account_consistency_service.h" |
6 | 6 |
7 #include <WebKit/WebKit.h> | 7 #include <WebKit/WebKit.h> |
8 | 8 |
9 #import "base/ios/weak_nsobject.h" | 9 #import "base/ios/weak_nsobject.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #import "base/mac/foundation_util.h" | 11 #import "base/mac/foundation_util.h" |
| 12 #include "base/macros.h" |
12 #include "base/prefs/scoped_user_pref_update.h" | 13 #include "base/prefs/scoped_user_pref_update.h" |
13 #include "base/strings/sys_string_conversions.h" | 14 #include "base/strings/sys_string_conversions.h" |
14 #include "base/time/time.h" | 15 #include "base/time/time.h" |
15 #include "components/google/core/browser/google_util.h" | 16 #include "components/google/core/browser/google_util.h" |
16 #include "components/pref_registry/pref_registry_syncable.h" | 17 #include "components/pref_registry/pref_registry_syncable.h" |
17 #include "components/signin/core/browser/account_reconcilor.h" | 18 #include "components/signin/core/browser/account_reconcilor.h" |
18 #include "components/signin/core/browser/signin_client.h" | 19 #include "components/signin/core/browser/signin_client.h" |
19 #include "components/signin/core/browser/signin_header_helper.h" | 20 #include "components/signin/core/browser/signin_header_helper.h" |
20 #include "ios/web/public/browser_state.h" | 21 #include "ios/web/public/browser_state.h" |
21 #include "ios/web/public/web_state/web_state_policy_decider.h" | 22 #include "ios/web/public/web_state/web_state_policy_decider.h" |
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
438 // |browser_state_| is now active. There might be some pending cookie requests | 439 // |browser_state_| is now active. There might be some pending cookie requests |
439 // to apply. | 440 // to apply. |
440 ApplyCookieRequests(); | 441 ApplyCookieRequests(); |
441 } | 442 } |
442 | 443 |
443 void AccountConsistencyService::OnInactive() { | 444 void AccountConsistencyService::OnInactive() { |
444 // |browser_state_| is now inactive. Stop using |web_view_| and don't create | 445 // |browser_state_| is now inactive. Stop using |web_view_| and don't create |
445 // a new one until it is active. | 446 // a new one until it is active. |
446 ResetWKWebView(); | 447 ResetWKWebView(); |
447 } | 448 } |
OLD | NEW |