chrome/browser/extensions/api/debugger/debugger_api.cc - Issue 11783038: Allow multiple WebUIControllerFactory objects to be registered. This makes is possible to implement…

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/extensions/api/debugger/debugger_api.cc

Issue 11783038: Allow multiple WebUIControllerFactory objects to be registered. This makes is possible to implement… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: reland after bogus revert of r175971 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

Index: chrome/browser/extensions/api/debugger/debugger_api.cc

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

--- chrome/browser/extensions/api/debugger/debugger_api.cc (revision 179096)

+++ chrome/browser/extensions/api/debugger/debugger_api.cc (working copy)

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

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

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

#include "content/public/common/content_client.h"

+#include "content/public/common/url_constants.h"

#include "extensions/common/error_utils.h"

#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"

@@ -428,8 +429,7 @@

}

contents_ = web_contents;

- if (content::GetContentClient()->HasWebUIScheme(

- contents_->GetURL())) {

+ if (content::HasWebUIScheme(contents_->GetURL())) {

error_ = ErrorUtils::FormatErrorMessage(

keys::kAttachToWebUIError,

contents_->GetURL().scheme());

« no previous file with comments | « chrome/browser/devtools/devtools_window.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »