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

Side by Side Diff: chrome/browser/ui/intents/web_intent_picker_controller.h

Issue 9649020: [Web Intents] WebIntentPickerModel uses URL instead of index to reference registered services. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac fix Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 const string16& action, 58 const string16& action,
59 const string16& type); 59 const string16& type);
60 60
61 protected: 61 protected:
62 // content::NotificationObserver implementation. 62 // content::NotificationObserver implementation.
63 virtual void Observe(int type, 63 virtual void Observe(int type,
64 const content::NotificationSource& source, 64 const content::NotificationSource& source,
65 const content::NotificationDetails& details) OVERRIDE; 65 const content::NotificationDetails& details) OVERRIDE;
66 66
67 // WebIntentPickerDelegate implementation. 67 // WebIntentPickerDelegate implementation.
68 virtual void OnServiceChosen(size_t index, Disposition disposition) OVERRIDE; 68 virtual void OnServiceChosen(const GURL& url,
69 Disposition disposition) OVERRIDE;
69 virtual void OnInlineDispositionWebContentsCreated( 70 virtual void OnInlineDispositionWebContentsCreated(
70 content::WebContents* web_contents) OVERRIDE; 71 content::WebContents* web_contents) OVERRIDE;
71 virtual void OnCancelled() OVERRIDE; 72 virtual void OnCancelled() OVERRIDE;
72 virtual void OnClosing() OVERRIDE; 73 virtual void OnClosing() OVERRIDE;
73 74
74 private: 75 private:
75 friend class WebIntentPickerControllerTest; 76 friend class WebIntentPickerControllerTest;
76 friend class WebIntentPickerControllerBrowserTest; 77 friend class WebIntentPickerControllerBrowserTest;
77 friend class InvokingTabObserver; 78 friend class InvokingTabObserver;
78 79
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 166
166 // Request consumer used when asynchronously loading favicons. 167 // Request consumer used when asynchronously loading favicons.
167 CancelableRequestConsumerTSimple<size_t> favicon_consumer_; 168 CancelableRequestConsumerTSimple<size_t> favicon_consumer_;
168 169
169 base::WeakPtrFactory<WebIntentPickerController> weak_ptr_factory_; 170 base::WeakPtrFactory<WebIntentPickerController> weak_ptr_factory_;
170 171
171 DISALLOW_COPY_AND_ASSIGN(WebIntentPickerController); 172 DISALLOW_COPY_AND_ASSIGN(WebIntentPickerController);
172 }; 173 };
173 174
174 #endif // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_ 175 #endif // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/web_intent_picker_gtk.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