OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "google_apis/gaia/gaia_urls.h" | 5 #include "google_apis/gaia/gaia_urls.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
10 #include "google_apis/gaia/gaia_switches.h" | 10 #include "google_apis/gaia/gaia_switches.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 GetSwitchValueWithDefault(switch_value, default_value, &string_value); | 66 GetSwitchValueWithDefault(switch_value, default_value, &string_value); |
67 const GURL result(string_value); | 67 const GURL result(string_value); |
68 DCHECK(result.is_valid()); | 68 DCHECK(result.is_valid()); |
69 return result; | 69 return result; |
70 } | 70 } |
71 | 71 |
72 | 72 |
73 } // namespace | 73 } // namespace |
74 | 74 |
75 GaiaUrls* GaiaUrls::GetInstance() { | 75 GaiaUrls* GaiaUrls::GetInstance() { |
76 return Singleton<GaiaUrls>::get(); | 76 return base::Singleton<GaiaUrls>::get(); |
77 } | 77 } |
78 | 78 |
79 GaiaUrls::GaiaUrls() { | 79 GaiaUrls::GaiaUrls() { |
80 google_url_ = GetURLSwitchValueWithDefault(switches::kGoogleUrl, | 80 google_url_ = GetURLSwitchValueWithDefault(switches::kGoogleUrl, |
81 kDefaultGoogleUrl); | 81 kDefaultGoogleUrl); |
82 gaia_url_ = GetURLSwitchValueWithDefault(switches::kGaiaUrl, kDefaultGaiaUrl); | 82 gaia_url_ = GetURLSwitchValueWithDefault(switches::kGaiaUrl, kDefaultGaiaUrl); |
83 lso_origin_url_ = | 83 lso_origin_url_ = |
84 GetURLSwitchValueWithDefault(switches::kLsoUrl, kDefaultGaiaUrl); | 84 GetURLSwitchValueWithDefault(switches::kLsoUrl, kDefaultGaiaUrl); |
85 google_apis_origin_url_ = GetURLSwitchValueWithDefault( | 85 google_apis_origin_url_ = GetURLSwitchValueWithDefault( |
86 switches::kGoogleApisUrl, kDefaultGoogleApisBaseUrl); | 86 switches::kGoogleApisUrl, kDefaultGoogleApisBaseUrl); |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 return source.empty() | 281 return source.empty() |
282 ? get_check_connection_info_url_ | 282 ? get_check_connection_info_url_ |
283 : get_check_connection_info_url_.Resolve( | 283 : get_check_connection_info_url_.Resolve( |
284 base::StringPrintf("?source=%s", source.c_str())); | 284 base::StringPrintf("?source=%s", source.c_str())); |
285 } | 285 } |
286 | 286 |
287 GURL GaiaUrls::signin_completed_continue_url() const { | 287 GURL GaiaUrls::signin_completed_continue_url() const { |
288 return | 288 return |
289 GURL("chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/success.html"); | 289 GURL("chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/success.html"); |
290 } | 290 } |
OLD | NEW |