chrome/browser/ui/webui/web_dialog_controller.h - Issue 10353007: Extract a minimal subset of WebDialogUI/WebDialogDelegate from src/chrome -> src/ui/web_dialogs

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

Unified Diff: chrome/browser/ui/webui/web_dialog_controller.h

Issue 10353007: Extract a minimal subset of WebDialogUI/WebDialogDelegate from src/chrome -> src/ui/web_dialogs Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/browser.h ('K') | « chrome/browser/ui/webui/test_web_dialog_delegate.h ('k') | chrome/browser/ui/webui/web_dialog_controller.cc » ('j') | ui/web_dialogs/web_dialog_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/web_dialog_controller.h

===================================================================

--- chrome/browser/ui/webui/web_dialog_controller.h (revision 135175)

+++ chrome/browser/ui/webui/web_dialog_controller.h (working copy)

@@ -6,7 +6,7 @@

#define CHROME_BROWSER_UI_WEBUI_WEB_DIALOG_CONTROLLER_H_

#pragma once

-#include "chrome/browser/ui/webui/web_dialog_ui.h"

+#include "ui/web_dialogs/web_dialog_ui.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

@@ -18,9 +18,9 @@

// avoid using an old Profile object.

class WebDialogController : public content::NotificationObserver {

public:

- WebDialogController(WebDialogDelegate* delegate,

- Profile* profile,

- Browser* browser);

+ WebDialogController(web_dialogs::WebDialogDelegate* delegate,

+ Profile* profile,

+ Browser* browser);

// content::NotificationObserver implementation.

virtual void Observe(int type,

@@ -30,7 +30,7 @@

private:

// The delegate controlled by this instance. This class is owned by the

// delegate.

- WebDialogDelegate* dialog_delegate_;

+ web_dialogs::WebDialogDelegate* dialog_delegate_;

// Used for notification of parent browser closing.

content::NotificationRegistrar registrar_;