chrome/browser/ui/webui/options/web_intents_settings_handler.cc - Issue 8417043: Add webkit_glue namespace. Improve some variable and test names.

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/options/web_intents_settings_handler.cc

Issue 8417043: Add webkit_glue namespace. Improve some variable and test names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge error Created 9 years, 2 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:

Index: chrome/browser/ui/webui/options/web_intents_settings_handler.cc

diff --git a/chrome/browser/ui/webui/options/web_intents_settings_handler.cc b/chrome/browser/ui/webui/options/web_intents_settings_handler.cc

index f12179992a755f23e0eacada352a66ac1a332e8d..9707915bffb959b89e78cbc426a9615783af8189 100644

--- a/chrome/browser/ui/webui/options/web_intents_settings_handler.cc

+++ b/chrome/browser/ui/webui/options/web_intents_settings_handler.cc

@@ -116,7 +116,7 @@ void WebIntentsSettingsHandler::RemoveOrigin(WebIntentsTreeNode* node) {

}

void WebIntentsSettingsHandler::RemoveService(ServiceTreeNode* snode) {

- WebIntentServiceData service;

+ webkit_glue::WebIntentServiceData service;

service.service_url = GURL(snode->ServiceUrl());

service.action = snode->Action();

string16 stype;