chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc - Issue 11881055: Simplify WebUI data sources. Currently WebUI data sources implement a URLDataSourceDelegate interfa…

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/tab_modal_confirm_dialog_webui.cc

Issue 11881055: Simplify WebUI data sources. Currently WebUI data sources implement a URLDataSourceDelegate interfa… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix issue in about_ui exposed by cros tests Created 7 years, 11 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

« no previous file with comments | « chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc ('k') | chrome/browser/ui/webui/task_manager/task_manager_ui.cc » ('j') | content/public/browser/url_data_source.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc

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

--- chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc (revision 176942)

+++ chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc (working copy)

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

#include "chrome/browser/ui/webui/chrome_url_data_manager.h"

#include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"

#include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"

+#include "chrome/browser/ui/webui/web_ui_util.h"

#include "chrome/common/jstemplate_builder.h"

#include "chrome/common/url_constants.h"

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

@@ -50,7 +51,7 @@

ChromeWebUIDataSource* data_source =

new ChromeWebUIDataSource(chrome::kChromeUITabModalConfirmDialogHost);

data_source->set_default_resource(IDR_TAB_MODAL_CONFIRM_DIALOG_HTML);

- ChromeURLDataManager::AddDataSource(profile, data_source);

+ ChromeURLDataManager::AddDataSourceImpl(profile, data_source);

constrained_web_dialog_delegate_ =

CreateConstrainedWebDialog(profile, this, NULL, web_contents);

@@ -81,7 +82,7 @@

dict.SetString("message", delegate_->GetMessage());

dict.SetString("accept", delegate_->GetAcceptButtonTitle());

dict.SetString("cancel", delegate_->GetCancelButtonTitle());

- ChromeWebUIDataSource::SetFontAndTextDirection(&dict);

+ web_ui_util::SetFontAndTextDirection(&dict);

std::string json;

base::JSONWriter::Write(&dict, &json);

return json;