chrome/browser/chromeos/login/signin/merge_session_load_page.h - Issue 286933002: [cros login] Split login related classes into subfolders.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/login/signin/merge_session_load_page.h

Issue 286933002: [cros login] Split login related classes into subfolders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix includes in new tests Created 6 years, 7 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/login/signin/auth_sync_observer_factory.cc ('k') | chrome/browser/chromeos/login/signin/merge_session_load_page.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_LOAD_PAGE_H_	5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_

6 #define CHROME_BROWSER_CHROMEOS_LOGIN_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 "chrome/browser/chromeos/login/merge_session_throttle.h"	12 #include "chrome/browser/chromeos/login/signin/merge_session_throttle.h"

13 #include "chrome/browser/chromeos/login/oauth2_login_manager.h"	13 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"

14 #include "content/public/browser/interstitial_page_delegate.h"	14 #include "content/public/browser/interstitial_page_delegate.h"

15 #include "url/gurl.h"	15 #include "url/gurl.h"

16	16

17 namespace base {	17 namespace base {

18 class DictionaryValue;	18 class DictionaryValue;

19 }	19 }

20	20

21 namespace content {	21 namespace content {

22 class InterstitialPage;	22 class InterstitialPage;

23 class WebContents;	23 class WebContents;

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77	77

78 content::WebContents* web_contents_;	78 content::WebContents* web_contents_;

79 GURL url_;	79 GURL url_;

80 content::InterstitialPage* interstitial_page_; // Owns us.	80 content::InterstitialPage* interstitial_page_; // Owns us.

81	81

82 DISALLOW_COPY_AND_ASSIGN(MergeSessionLoadPage);	82 DISALLOW_COPY_AND_ASSIGN(MergeSessionLoadPage);

83 };	83 };

84	84

85 } // namespace chromeos	85 } // namespace chromeos

86	86

87 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_LOAD_PAGE_H_	87 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_

OLD	NEW