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

Side by Side Diff: chrome/browser/signin/chrome_signin_client.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 #include "chrome/browser/signin/chrome_signin_client.h" 5 #include "chrome/browser/signin/chrome_signin_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/prefs/pref_service.h"
12 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
13 #include "build/build_config.h" 12 #include "build/build_config.h"
14 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/content_settings/cookie_settings_factory.h" 14 #include "chrome/browser/content_settings/cookie_settings_factory.h"
16 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 15 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
17 #include "chrome/browser/profiles/profile_info_cache.h" 16 #include "chrome/browser/profiles/profile_info_cache.h"
18 #include "chrome/browser/profiles/profile_manager.h" 17 #include "chrome/browser/profiles/profile_manager.h"
19 #include "chrome/browser/profiles/profile_metrics.h" 18 #include "chrome/browser/profiles/profile_metrics.h"
20 #include "chrome/browser/profiles/profile_window.h" 19 #include "chrome/browser/profiles/profile_window.h"
21 #include "chrome/browser/signin/local_auth.h" 20 #include "chrome/browser/signin/local_auth.h"
22 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 21 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
23 #include "chrome/browser/signin/signin_manager_factory.h" 22 #include "chrome/browser/signin/signin_manager_factory.h"
24 #include "chrome/browser/web_data_service_factory.h" 23 #include "chrome/browser/web_data_service_factory.h"
25 #include "chrome/common/channel_info.h" 24 #include "chrome/common/channel_info.h"
26 #include "components/content_settings/core/browser/cookie_settings.h" 25 #include "components/content_settings/core/browser/cookie_settings.h"
27 #include "components/metrics/metrics_service.h" 26 #include "components/metrics/metrics_service.h"
27 #include "components/prefs/pref_service.h"
28 #include "components/signin/core/browser/profile_oauth2_token_service.h" 28 #include "components/signin/core/browser/profile_oauth2_token_service.h"
29 #include "components/signin/core/browser/signin_cookie_changed_subscription.h" 29 #include "components/signin/core/browser/signin_cookie_changed_subscription.h"
30 #include "components/signin/core/browser/signin_header_helper.h" 30 #include "components/signin/core/browser/signin_header_helper.h"
31 #include "components/signin/core/common/profile_management_switches.h" 31 #include "components/signin/core/common/profile_management_switches.h"
32 #include "components/signin/core/common/signin_pref_names.h" 32 #include "components/signin/core/common/signin_pref_names.h"
33 #include "components/signin/core/common/signin_switches.h" 33 #include "components/signin/core/common/signin_switches.h"
34 #include "google_apis/gaia/gaia_constants.h" 34 #include "google_apis/gaia/gaia_constants.h"
35 #include "google_apis/gaia/gaia_urls.h" 35 #include "google_apis/gaia/gaia_urls.h"
36 #include "net/url_request/url_request_context_getter.h" 36 #include "net/url_request/url_request_context_getter.h"
37 #include "url/gurl.h" 37 #include "url/gurl.h"
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 ProfileOAuth2TokenService* token_service = 374 ProfileOAuth2TokenService* token_service =
375 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_); 375 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
376 OAuth2TokenService::ScopeSet scopes; 376 OAuth2TokenService::ScopeSet scopes;
377 scopes.insert(GaiaConstants::kGoogleUserInfoEmail); 377 scopes.insert(GaiaConstants::kGoogleUserInfoEmail);
378 oauth_request_ = token_service->StartRequest(account_id, scopes, this); 378 oauth_request_ = token_service->StartRequest(account_id, scopes, this);
379 } 379 }
380 } 380 }
381 } 381 }
382 #endif 382 #endif
383 } 383 }
OLDNEW
« no previous file with comments | « chrome/browser/signin/chrome_proximity_auth_client.cc ('k') | chrome/browser/signin/cross_device_promo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698