chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.cc - Issue 12302015: Merge 182702

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/ui/webui/signin/profile_signin_confirmation_ui.cc

Issue 12302015: Merge 182702 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

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 #include "chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h"	5 #include "chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h"

6	6

7 #include "base/values.h"	7 #include "base/values.h"

8 #include "chrome/browser/profiles/profile.h"	8 #include "chrome/browser/profiles/profile.h"

9 #include "chrome/common/url_constants.h"	9 #include "chrome/common/url_constants.h"

10 #include "content/public/browser/web_contents.h"	10 #include "content/public/browser/web_contents.h"

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
49 html_source->AddResourcePath("profile_signin_confirmation.js",	49 html_source->AddResourcePath("profile_signin_confirmation.js",

50 IDR_PROFILE_SIGNIN_CONFIRMATION_JS);	50 IDR_PROFILE_SIGNIN_CONFIRMATION_JS);

51 html_source->SetDefaultResource(IDR_PROFILE_SIGNIN_CONFIRMATION_HTML);	51 html_source->SetDefaultResource(IDR_PROFILE_SIGNIN_CONFIRMATION_HTML);

52	52

53 Profile* profile = Profile::FromWebUI(web_ui);	53 Profile* profile = Profile::FromWebUI(web_ui);

54 content::WebUIDataSource::Add(profile, html_source);	54 content::WebUIDataSource::Add(profile, html_source);

55 }	55 }

56	56

57 ProfileSigninConfirmationUI::~ProfileSigninConfirmationUI() {	57 ProfileSigninConfirmationUI::~ProfileSigninConfirmationUI() {

58 }	58 }

OLD	NEW