chrome/browser/invalidation/ticl_invalidation_service.cc - Issue 186883002: Move user_agent code from webkit/ to content/.

Side by Side Diff: chrome/browser/invalidation/ticl_invalidation_service.cc

Issue 186883002: Move user_agent code from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review Created 6 years, 9 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/feedback/feedback_util.cc ('k') | chrome/browser/net/basic_http_user_agent_settings.cc » ('j') | content/common/user_agent.cc » ('J')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 #include "chrome/browser/invalidation/ticl_invalidation_service.h"	5 #include "chrome/browser/invalidation/ticl_invalidation_service.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/metrics/histogram.h"	8 #include "base/metrics/histogram.h"

9 #include "chrome/browser/chrome_notification_types.h"	9 #include "chrome/browser/chrome_notification_types.h"

10 #include "chrome/browser/invalidation/gcm_network_channel_delegate_impl.h"	10 #include "chrome/browser/invalidation/gcm_network_channel_delegate_impl.h"

11 #include "chrome/browser/invalidation/invalidation_logger.h"	11 #include "chrome/browser/invalidation/invalidation_logger.h"

12 #include "chrome/browser/invalidation/invalidation_service_util.h"	12 #include "chrome/browser/invalidation/invalidation_service_util.h"

13 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/signin/about_signin_internals.h"	14 #include "chrome/browser/signin/about_signin_internals.h"

15 #include "chrome/browser/signin/about_signin_internals_factory.h"	15 #include "chrome/browser/signin/about_signin_internals_factory.h"

16 #include "chrome/browser/signin/profile_oauth2_token_service.h"	16 #include "chrome/browser/signin/profile_oauth2_token_service.h"

17 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	17 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

18 #include "chrome/browser/signin/signin_manager.h"	18 #include "chrome/browser/signin/signin_manager.h"

19 #include "content/public/browser/notification_service.h"	19 #include "content/public/browser/notification_service.h"

	20 #include "content/public/common/user_agent.h"

20 #include "google_apis/gaia/gaia_constants.h"	21 #include "google_apis/gaia/gaia_constants.h"

21 #include "sync/notifier/gcm_network_channel_delegate.h"	22 #include "sync/notifier/gcm_network_channel_delegate.h"

22 #include "sync/notifier/invalidation_util.h"	23 #include "sync/notifier/invalidation_util.h"

23 #include "sync/notifier/invalidator.h"	24 #include "sync/notifier/invalidator.h"

24 #include "sync/notifier/invalidator_state.h"	25 #include "sync/notifier/invalidator_state.h"

25 #include "sync/notifier/non_blocking_invalidator.h"	26 #include "sync/notifier/non_blocking_invalidator.h"

26 #include "sync/notifier/object_id_invalidation_map.h"	27 #include "sync/notifier/object_id_invalidation_map.h"

27	28

28 static const char* kOAuth2Scopes[] = {	29 static const char* kOAuth2Scopes[] = {

29 GaiaConstants::kGoogleTalkOAuth2Scope	30 GaiaConstants::kGoogleTalkOAuth2Scope

(...skipping 384 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
414 }	415 }

415	416

416 // This service always expects to have a valid invalidator storage.	417 // This service always expects to have a valid invalidator storage.

417 // So we must not only clear the old one, but also start a new one.	418 // So we must not only clear the old one, but also start a new one.

418 invalidator_storage_->Clear();	419 invalidator_storage_->Clear();

419 invalidator_storage_.reset(new InvalidatorStorage(profile_->GetPrefs()));	420 invalidator_storage_.reset(new InvalidatorStorage(profile_->GetPrefs()));

420 invalidator_storage_->SetInvalidatorClientId(GenerateInvalidatorClientId());	421 invalidator_storage_->SetInvalidatorClientId(GenerateInvalidatorClientId());

421 }	422 }

422	423

423 } // namespace invalidation	424 } // namespace invalidation

OLD	NEW