chrome/browser/ui/intents/web_intents_model.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/intents/web_intents_model.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/intents/web_intents_model.cc

diff --git a/chrome/browser/ui/intents/web_intents_model.cc b/chrome/browser/ui/intents/web_intents_model.cc

index abaf9f374f1a819a79dbd293ef3b26645bdd135b..122bccc436d2af16fa6eb88d39cbcc199f498c1b 100644

--- a/chrome/browser/ui/intents/web_intents_model.cc

+++ b/chrome/browser/ui/intents/web_intents_model.cc

@@ -121,7 +121,7 @@ void WebIntentsModel::LoadModel() {

void WebIntentsModel::OnIntentsQueryDone(

WebIntentsRegistry::QueryID query_id,

- const std::vector<WebIntentServiceData>& services) {

+ const std::vector<webkit_glue::WebIntentServiceData>& services) {

for (size_t i = 0; i < services.size(); ++i) {

// Eventually do some awesome sorting, grouping, clustering stuff here.

// For now, just stick it in the model flat.