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

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

Issue 9805005: [Web Intents] Fix crash when invoking intent in incognito mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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
« no previous file with comments | « no previous file | chrome/browser/ui/intents/web_intent_picker_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 WebIntentPickerControllerBrowserTest; 77 friend class WebIntentPickerControllerBrowserTest;
78 friend class WebIntentPickerControllerIncognitoBrowserTest;
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
87 // Exposed for tests only. 88 // Exposed for tests only.
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/intents/web_intent_picker_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698