chrome/browser/chromeos/login/merge_session_load_page.h - Issue 12319034: Merge 182894

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/merge_session_load_page.h

Issue 12319034: Merge 182894 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/

Patch Set: Created 7 years, 10 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:

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_MERGE_SESSION_LOAD_PAGE_H_

6 #define CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_LOAD_PAGE_H_	6 #define CHROME_BROWSER_CHROMEOS_LOGIN_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"

(...skipping 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77 content::WebContents* web_contents_;	77 content::WebContents* web_contents_;

78 GURL url_;	78 GURL url_;

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

80	80

81 DISALLOW_COPY_AND_ASSIGN(MergeSessionLoadPage);	81 DISALLOW_COPY_AND_ASSIGN(MergeSessionLoadPage);

82 };	82 };

83	83

84 } // namespace chromeos	84 } // namespace chromeos

85	85

86 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_LOAD_PAGE_H_	86 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MERGE_SESSION_LOAD_PAGE_H_

OLD	NEW