OLD | NEW |
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 #ifndef CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_CLIENT_H_ |
6 #define CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_CLIENT_H_ | 6 #define CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_CLIENT_H_ |
7 | 7 |
8 #include "base/basictypes.h" | |
9 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/macros.h" |
| 10 #include "build/build_config.h" |
10 #include "components/signin/core/browser/signin_client.h" | 11 #include "components/signin/core/browser/signin_client.h" |
11 #include "components/signin/core/browser/signin_error_controller.h" | 12 #include "components/signin/core/browser/signin_error_controller.h" |
12 #include "google_apis/gaia/gaia_oauth_client.h" | 13 #include "google_apis/gaia/gaia_oauth_client.h" |
13 #include "google_apis/gaia/oauth2_token_service.h" | 14 #include "google_apis/gaia/oauth2_token_service.h" |
14 | 15 |
15 #if !defined(OS_CHROMEOS) | 16 #if !defined(OS_CHROMEOS) |
16 #include "net/base/network_change_notifier.h" | 17 #include "net/base/network_change_notifier.h" |
17 #endif | 18 #endif |
18 | 19 |
19 namespace content_settings { | 20 namespace content_settings { |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 std::list<base::Closure> delayed_callbacks_; | 110 std::list<base::Closure> delayed_callbacks_; |
110 #endif | 111 #endif |
111 | 112 |
112 scoped_ptr<gaia::GaiaOAuthClient> oauth_client_; | 113 scoped_ptr<gaia::GaiaOAuthClient> oauth_client_; |
113 scoped_ptr<OAuth2TokenService::Request> oauth_request_; | 114 scoped_ptr<OAuth2TokenService::Request> oauth_request_; |
114 | 115 |
115 DISALLOW_COPY_AND_ASSIGN(ChromeSigninClient); | 116 DISALLOW_COPY_AND_ASSIGN(ChromeSigninClient); |
116 }; | 117 }; |
117 | 118 |
118 #endif // CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_CLIENT_H_ | 119 #endif // CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_CLIENT_H_ |
OLD | NEW |