| OLD | NEW | 
|    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 "components/signin/core/browser/signin_header_helper.h" |    5 #include "components/signin/core/browser/signin_header_helper.h" | 
|    6  |    6  | 
|    7 #include <stddef.h> |    7 #include <stddef.h> | 
|    8  |    8  | 
|    9 #include "base/logging.h" |    9 #include "base/logging.h" | 
|   10 #include "base/macros.h" |   10 #include "base/macros.h" | 
|   11 #include "base/strings/string_split.h" |   11 #include "base/strings/string_split.h" | 
|   12 #include "components/content_settings/core/browser/cookie_settings.h" |   12 #include "components/content_settings/core/browser/cookie_settings.h" | 
|   13 #include "components/google/core/browser/google_util.h" |   13 #include "components/google/core/browser/google_util.h" | 
|   14 #include "components/signin/core/browser/chrome_connected_header_helper.h" |   14 #include "components/signin/core/browser/chrome_connected_header_helper.h" | 
|   15 #include "components/signin/core/common/profile_management_switches.h" |   15 #include "components/signin/core/common/profile_management_switches.h" | 
|   16 #include "google_apis/gaia/gaia_auth_util.h" |   16 #include "google_apis/gaia/gaia_auth_util.h" | 
|   17 #include "google_apis/gaia/gaia_urls.h" |   17 #include "google_apis/gaia/gaia_urls.h" | 
|   18 #include "net/base/escape.h" |   18 #include "net/base/escape.h" | 
|   19 #include "net/url_request/url_request.h" |   19 #include "net/url_request/url_request.h" | 
|   20 #include "url/gurl.h" |  | 
|   21  |   20  | 
|   22 #if !defined(OS_IOS) && !defined(OS_ANDROID) |   21 #if !defined(OS_IOS) && !defined(OS_ANDROID) | 
|   23 #include "components/signin/core/browser/dice_header_helper.h" |   22 #include "components/signin/core/browser/dice_header_helper.h" | 
|   24 #endif |   23 #endif | 
|   25  |   24  | 
|   26 namespace signin { |   25 namespace signin { | 
|   27  |   26  | 
|   28 extern const char kChromeConnectedHeader[] = "X-Chrome-Connected"; |   27 extern const char kChromeConnectedHeader[] = "X-Chrome-Connected"; | 
|   29 extern const char kDiceRequestHeader[] = "X-Chrome-ID-Consistency-Request"; |   28 extern const char kDiceRequestHeader[] = "X-Chrome-ID-Consistency-Request"; | 
|   30  |   29  | 
|   31 ManageAccountsParams::ManageAccountsParams() |   30 ManageAccountsParams::ManageAccountsParams() | 
|   32     : service_type(GAIA_SERVICE_TYPE_NONE), |   31     : service_type(GAIA_SERVICE_TYPE_NONE), | 
|   33       email(""), |   32       email(""), | 
|   34       is_saml(false), |   33       is_saml(false), | 
|   35       continue_url(""), |   34       continue_url(""), | 
|   36       is_same_tab(false) { |   35       is_same_tab(false) { | 
|   37 #if !defined(OS_IOS) |   36 #if !defined(OS_IOS) | 
|   38   child_id = 0; |   37   child_id = 0; | 
|   39   route_id = 0; |   38   route_id = 0; | 
|   40 #endif  // !defined(OS_IOS) |   39 #endif  // !defined(OS_IOS) | 
|   41 } |   40 } | 
|   42  |   41  | 
|   43 ManageAccountsParams::ManageAccountsParams(const ManageAccountsParams& other) = |   42 ManageAccountsParams::ManageAccountsParams(const ManageAccountsParams& other) = | 
|   44     default; |   43     default; | 
|   45  |   44  | 
 |   45 DiceResponseParams::DiceResponseParams() : user_intention(DiceAction::NONE) {} | 
 |   46  | 
 |   47 DiceResponseParams::~DiceResponseParams() {} | 
 |   48  | 
 |   49 DiceResponseParams::DiceResponseParams(const DiceResponseParams& other) = | 
 |   50     default; | 
 |   51  | 
|   46 bool SettingsAllowSigninCookies( |   52 bool SettingsAllowSigninCookies( | 
|   47     const content_settings::CookieSettings* cookie_settings) { |   53     const content_settings::CookieSettings* cookie_settings) { | 
|   48   GURL gaia_url = GaiaUrls::GetInstance()->gaia_url(); |   54   GURL gaia_url = GaiaUrls::GetInstance()->gaia_url(); | 
|   49   GURL google_url = GaiaUrls::GetInstance()->google_url(); |   55   GURL google_url = GaiaUrls::GetInstance()->google_url(); | 
|   50   return cookie_settings && |   56   return cookie_settings && | 
|   51          cookie_settings->IsCookieAccessAllowed(gaia_url, gaia_url) && |   57          cookie_settings->IsCookieAccessAllowed(gaia_url, gaia_url) && | 
|   52          cookie_settings->IsCookieAccessAllowed(google_url, google_url); |   58          cookie_settings->IsCookieAccessAllowed(google_url, google_url); | 
|   53 } |   59 } | 
|   54  |   60  | 
|   55 std::string BuildMirrorRequestCookieIfPossible( |   61 std::string BuildMirrorRequestCookieIfPossible( | 
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  146   chrome_connected_helper.AppendOrRemoveRequestHeader( |  152   chrome_connected_helper.AppendOrRemoveRequestHeader( | 
|  147       request, kChromeConnectedHeader, redirect_url, account_id, |  153       request, kChromeConnectedHeader, redirect_url, account_id, | 
|  148       cookie_settings, profile_mode_mask); |  154       cookie_settings, profile_mode_mask); | 
|  149 } |  155 } | 
|  150  |  156  | 
|  151 ManageAccountsParams BuildManageAccountsParams( |  157 ManageAccountsParams BuildManageAccountsParams( | 
|  152     const std::string& header_value) { |  158     const std::string& header_value) { | 
|  153   return ChromeConnectedHeaderHelper::BuildManageAccountsParams(header_value); |  159   return ChromeConnectedHeaderHelper::BuildManageAccountsParams(header_value); | 
|  154 } |  160 } | 
|  155  |  161  | 
 |  162 #if !defined(OS_IOS) && !defined(OS_ANDROID) | 
 |  163 DiceResponseParams BuildDiceResponseParams(const std::string& header_value) { | 
 |  164   return DiceHeaderHelper::BuildDiceResponseParams(header_value); | 
 |  165 } | 
 |  166 #endif | 
 |  167  | 
|  156 }  // namespace signin |  168 }  // namespace signin | 
| OLD | NEW |