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_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_ |
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_ | 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/macros.h" |
12 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" | 13 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" |
13 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" | 14 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" |
14 #include "content/public/browser/interstitial_page_delegate.h" | 15 #include "content/public/browser/interstitial_page_delegate.h" |
15 #include "url/gurl.h" | 16 #include "url/gurl.h" |
16 | 17 |
17 namespace base { | 18 namespace base { |
18 class DictionaryValue; | 19 class DictionaryValue; |
19 } | 20 } |
20 | 21 |
21 namespace content { | 22 namespace content { |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 content::WebContents* web_contents_; | 78 content::WebContents* web_contents_; |
78 GURL url_; | 79 GURL url_; |
79 content::InterstitialPage* interstitial_page_; // Owns us. | 80 content::InterstitialPage* interstitial_page_; // Owns us. |
80 | 81 |
81 DISALLOW_COPY_AND_ASSIGN(MergeSessionLoadPage); | 82 DISALLOW_COPY_AND_ASSIGN(MergeSessionLoadPage); |
82 }; | 83 }; |
83 | 84 |
84 } // namespace chromeos | 85 } // namespace chromeos |
85 | 86 |
86 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_ | 87 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_ |
OLD | NEW |