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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc

Issue 382983003: Pass signin_scoped_device_id to refresh token request on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 5 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
« no previous file with comments | « chrome/browser/chromeos/login/signin/oauth2_token_fetcher.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/ui/webui/chromeos/login/inline_login_handler_chromeos.h " 5 #include "chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h "
6 6
7 #include "chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h" 7 #include "chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/signin/chrome_signin_client_factory.h"
9 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 10 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
10 #include "chrome/browser/signin/signin_manager_factory.h" 11 #include "chrome/browser/signin/signin_manager_factory.h"
11 #include "chrome/browser/signin/signin_promo.h" 12 #include "chrome/browser/signin/signin_promo.h"
12 #include "chrome/common/url_constants.h" 13 #include "chrome/common/url_constants.h"
13 #include "components/signin/core/browser/profile_oauth2_token_service.h" 14 #include "components/signin/core/browser/profile_oauth2_token_service.h"
15 #include "components/signin/core/browser/signin_client.h"
14 #include "components/signin/core/browser/signin_manager.h" 16 #include "components/signin/core/browser/signin_manager.h"
15 #include "content/public/browser/storage_partition.h" 17 #include "content/public/browser/storage_partition.h"
16 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
17 #include "content/public/browser/web_ui.h" 19 #include "content/public/browser/web_ui.h"
18 #include "google_apis/gaia/gaia_urls.h" 20 #include "google_apis/gaia/gaia_urls.h"
19 #include "net/base/url_util.h" 21 #include "net/base/url_util.h"
20 22
21 namespace chromeos { 23 namespace chromeos {
22 24
23 class InlineLoginHandlerChromeOS::InlineLoginUIOAuth2Delegate 25 class InlineLoginHandlerChromeOS::InlineLoginUIOAuth2Delegate
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 dict->GetString("email", &account_id); 76 dict->GetString("email", &account_id);
75 CHECK(!account_id.empty()) << "Account ID is empty."; 77 CHECK(!account_id.empty()) << "Account ID is empty.";
76 78
77 oauth2_delegate_.reset(new InlineLoginUIOAuth2Delegate(web_ui(), account_id)); 79 oauth2_delegate_.reset(new InlineLoginUIOAuth2Delegate(web_ui(), account_id));
78 net::URLRequestContextGetter* request_context = 80 net::URLRequestContextGetter* request_context =
79 content::BrowserContext::GetStoragePartitionForSite( 81 content::BrowserContext::GetStoragePartitionForSite(
80 profile, GURL(chrome::kChromeUIChromeSigninURL)) 82 profile, GURL(chrome::kChromeUIChromeSigninURL))
81 ->GetURLRequestContext(); 83 ->GetURLRequestContext();
82 oauth2_token_fetcher_.reset( 84 oauth2_token_fetcher_.reset(
83 new OAuth2TokenFetcher(oauth2_delegate_.get(), request_context)); 85 new OAuth2TokenFetcher(oauth2_delegate_.get(), request_context));
84 oauth2_token_fetcher_->StartExchangeFromCookies(session_index); 86 SigninClient* signin_client =
87 ChromeSigninClientFactory::GetForProfile(profile);
88 std::string signin_scoped_device_id =
89 signin_client->GetSigninScopedDeviceId();
90 oauth2_token_fetcher_->StartExchangeFromCookies(session_index,
91 signin_scoped_device_id);
85 } 92 }
86 93
87 } // namespace chromeos 94 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/signin/oauth2_token_fetcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698