Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4071)

Unified Diff: chrome/browser/ui/intents/web_intent_picker_controller.h

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/intents/web_intent_picker_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/intents/web_intent_picker_controller.h
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.h b/chrome/browser/ui/intents/web_intent_picker_controller.h
index fd88d96039139639b0d72cd8ffcdcc4e00d083e5..7dee43936a0645fc240f1bca4f5310835a78341b 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.h
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.h
@@ -24,7 +24,10 @@ class TabContentsWrapper;
class WebDataService;
class WebIntentPicker;
class WebIntentPickerFactory;
+
+namespace webkit_glue {
struct WebIntentServiceData;
+}
// Controls the creation of the WebIntentPicker UI and forwards the user's
// intent handler choice back to the TabContents object.
@@ -71,7 +74,7 @@ class WebIntentPickerController : public content::NotificationObserver,
// Called from the WebIntentDataFetcher when intent data is available.
void OnWebIntentDataAvailable(
- const std::vector<WebIntentServiceData>& intent_data);
+ const std::vector<webkit_glue::WebIntentServiceData>& services);
// Called from the FaviconDataFetcher when a favicon is available.
void OnFaviconDataAvailable(size_t index, const SkBitmap& icon_bitmap);
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/intents/web_intent_picker_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698