Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 67 // WebIntentPickerDelegate implementation. | 67 // WebIntentPickerDelegate implementation. |
| 68 virtual void OnServiceChosen(const GURL& url, | 68 virtual void OnServiceChosen(const GURL& url, |
| 69 Disposition disposition) OVERRIDE; | 69 Disposition disposition) OVERRIDE; |
| 70 virtual void OnInlineDispositionWebContentsCreated( | 70 virtual void OnInlineDispositionWebContentsCreated( |
| 71 content::WebContents* web_contents) OVERRIDE; | 71 content::WebContents* web_contents) OVERRIDE; |
| 72 virtual void OnCancelled() OVERRIDE; | 72 virtual void OnCancelled() OVERRIDE; |
| 73 virtual void OnClosing() OVERRIDE; | 73 virtual void OnClosing() OVERRIDE; |
| 74 | 74 |
| 75 private: | 75 private: |
| 76 friend class WebIntentPickerControllerTest; | 76 friend class WebIntentPickerControllerTest; |
| 77 friend class WebIntentPickerControllerBrowserIncognitoTest; | |
|
groby-ooo-7-16
2012/03/22 00:20:24
FRIEND_TEST_ALL_PREFIXES(WebIntentPickerController
binji
2012/03/22 00:38:40
The individual tests don't need to be friends, jus
| |
| 77 friend class WebIntentPickerControllerBrowserTest; | 78 friend class WebIntentPickerControllerBrowserTest; |
| 78 friend class InvokingTabObserver; | 79 friend class InvokingTabObserver; |
| 79 | 80 |
| 80 // Gets a notification when the return message is sent to the source tab, | 81 // Gets a notification when the return message is sent to the source tab, |
| 81 // so we can close the picker dialog or service tab. | 82 // so we can close the picker dialog or service tab. |
| 82 void OnSendReturnMessage(webkit_glue::WebIntentReplyType reply_type); | 83 void OnSendReturnMessage(webkit_glue::WebIntentReplyType reply_type); |
| 83 | 84 |
| 84 // Exposed for tests only. | 85 // Exposed for tests only. |
| 85 void set_picker(WebIntentPicker* picker) { picker_ = picker; } | 86 void set_picker(WebIntentPicker* picker) { picker_ = picker; } |
| 86 | 87 |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 166 | 167 |
| 167 // Request consumer used when asynchronously loading favicons. | 168 // Request consumer used when asynchronously loading favicons. |
| 168 CancelableRequestConsumerTSimple<size_t> favicon_consumer_; | 169 CancelableRequestConsumerTSimple<size_t> favicon_consumer_; |
| 169 | 170 |
| 170 base::WeakPtrFactory<WebIntentPickerController> weak_ptr_factory_; | 171 base::WeakPtrFactory<WebIntentPickerController> weak_ptr_factory_; |
| 171 | 172 |
| 172 DISALLOW_COPY_AND_ASSIGN(WebIntentPickerController); | 173 DISALLOW_COPY_AND_ASSIGN(WebIntentPickerController); |
| 173 }; | 174 }; |
| 174 | 175 |
| 175 #endif // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_ | 176 #endif // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_ |
| OLD | NEW |