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 #include <algorithm> | 5 #include <algorithm> |
6 #include <iterator> | 6 #include <iterator> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 return intent_; | 190 return intent_; |
191 } | 191 } |
192 | 192 |
193 virtual void DispatchIntent(content::WebContents* web_contents) OVERRIDE { | 193 virtual void DispatchIntent(content::WebContents* web_contents) OVERRIDE { |
194 dispatched_ = true; | 194 dispatched_ = true; |
195 } | 195 } |
196 | 196 |
197 virtual void ResetDispatch() OVERRIDE { | 197 virtual void ResetDispatch() OVERRIDE { |
198 } | 198 } |
199 | 199 |
200 virtual void SendReplyMessage(webkit_glue::WebIntentReplyType reply_type, | |
201 const string16& data) OVERRIDE { | |
202 replied_ = true; | |
203 } | |
204 | |
205 virtual void SendReply(const webkit_glue::WebIntentReply& reply) OVERRIDE { | 200 virtual void SendReply(const webkit_glue::WebIntentReply& reply) OVERRIDE { |
206 replied_ = true; | 201 replied_ = true; |
207 } | 202 } |
208 | 203 |
209 virtual void RegisterReplyNotification( | 204 virtual void RegisterReplyNotification( |
210 const base::Callback<void(webkit_glue::WebIntentReplyType)>&) OVERRIDE { | 205 const base::Callback<void(webkit_glue::WebIntentReplyType)>&) OVERRIDE { |
211 } | 206 } |
212 | 207 |
213 webkit_glue::WebIntentData intent_; | 208 webkit_glue::WebIntentData intent_; |
214 bool dispatched_; | 209 bool dispatched_; |
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
795 service_web_contents)); | 790 service_web_contents)); |
796 observer.Wait(); | 791 observer.Wait(); |
797 picker_.Wait(); | 792 picker_.Wait(); |
798 | 793 |
799 // The service tab is closed and the picker is shown again | 794 // The service tab is closed and the picker is shown again |
800 // on the original tab. | 795 // on the original tab. |
801 EXPECT_EQ(1, browser()->tab_count()); | 796 EXPECT_EQ(1, browser()->tab_count()); |
802 EXPECT_EQ(2, picker_.num_installed_services_); | 797 EXPECT_EQ(2, picker_.num_installed_services_); |
803 EXPECT_EQ(0, picker_.num_inline_disposition_); | 798 EXPECT_EQ(0, picker_.num_inline_disposition_); |
804 } | 799 } |
OLD | NEW |