intents: Remove the disposition enum in web intents model.

R=groby@chromium.org
BUG=None


Review URL: https://chromiumcodereview.appspot.com/10855066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152000 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm

@@ -11,13 +11,16 @@
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 class MockIntentPickerDelegate : public WebIntentPickerDelegate {
  public:
   MockIntentPickerDelegate() {}
   virtual ~MockIntentPickerDelegate() {}
 
-  MOCK_METHOD2(OnServiceChosen, void(const GURL& url, Disposition disposition));
+  MOCK_METHOD2(OnServiceChosen, void(
+      const GURL& url,
+      webkit_glue::WebIntentServiceData::Disposition disposition));
   MOCK_METHOD1(OnInlineDispositionWebContentsCreated,
       void(content::WebContents* web_contents));
   MOCK_METHOD1(OnExtensionInstallRequested, void(const std::string& id));
@@ -74,10 +77,10 @@ IN_PROC_BROWSER_TEST_F(WebIntentSheetControllerBrowserTest,
 
   GURL url;
   model_.AddInstalledService(string16(), url,
-      WebIntentPickerModel::DISPOSITION_WINDOW);
+      webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
 
   EXPECT_CALL(delegate_, OnServiceChosen(
-      url, WebIntentPickerModel::DISPOSITION_WINDOW));
+      url, webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW));
   EXPECT_CALL(delegate_, OnPickerClosed()).Times(0);
   EXPECT_CALL(delegate_, OnClosing());
 

chrome/browser/ui/cocoa/web_intent_sheet_controller_unittest.mm

@@ -100,9 +100,9 @@ TEST_F(WebIntentPickerSheetControllerTest, NoRows) {
 TEST_F(WebIntentPickerSheetControllerTest, PopulatedRows) {
   WebIntentPickerModel model;
   model.AddInstalledService(string16(), GURL("http://example.org/intent.html"),
-      WebIntentPickerModel::DISPOSITION_WINDOW);
+      webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
   model.AddInstalledService(string16(), GURL("http://example.com/intent.html"),
-      WebIntentPickerModel::DISPOSITION_WINDOW);
+      webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
 
   [controller_ performLayoutWithModel:&model];
 

chrome/browser/ui/intents/web_intent_picker_controller.cc

@@ -48,7 +48,6 @@
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
-#include "webkit/glue/web_intent_service_data.h"
 
 using extensions::WebstoreInstaller;
 
@@ -83,19 +82,6 @@ CWSIntentsRegistry* GetCWSIntentsRegistry(TabContents* tab_contents) {
   return CWSIntentsRegistryFactory::GetForProfile(tab_contents->profile());
 }
 
-WebIntentPickerModel::Disposition ConvertDisposition(
-    webkit_glue::WebIntentServiceData::Disposition disposition) {
-  switch (disposition) {
-    case webkit_glue::WebIntentServiceData::DISPOSITION_INLINE:
-      return WebIntentPickerModel::DISPOSITION_INLINE;
-    case webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW:
-      return WebIntentPickerModel::DISPOSITION_WINDOW;
-    default:
-      NOTREACHED();
-      return WebIntentPickerModel::DISPOSITION_WINDOW;
-  }
-}
-
 // Returns the action-specific string for |action|.
 string16 GetIntentActionString(const std::string& action) {
   if (!action.compare(kShareActionURL))
@@ -298,8 +284,9 @@ void WebIntentPickerController::Observe(
   ClosePicker();
 }
 
-void WebIntentPickerController::OnServiceChosen(const GURL& url,
-                                                Disposition disposition) {
+void WebIntentPickerController::OnServiceChosen(
+    const GURL& url,
+    webkit_glue::WebIntentServiceData::Disposition disposition) {
   ExtensionService* service = tab_contents_->profile()->GetExtensionService();
   DCHECK(service);
   const extensions::Extension* extension = service->GetInstalledApp(url);
@@ -315,14 +302,14 @@ void WebIntentPickerController::OnServiceChosen(const GURL& url,
   }
 
   switch (disposition) {
-    case WebIntentPickerModel::DISPOSITION_INLINE:
+    case webkit_glue::WebIntentServiceData::DISPOSITION_INLINE:
       // Set the model to inline disposition. It will notify the picker which
       // will respond (via OnInlineDispositionWebContentsCreated) with the
       // WebContents to dispatch the intent to.
       picker_model_->SetInlineDisposition(url);
       break;
 
-    case WebIntentPickerModel::DISPOSITION_WINDOW: {
+    case webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW: {
       Browser* browser = browser::FindBrowserWithWebContents(
           tab_contents_->web_contents());
       TabContents* contents = chrome::TabContentsFactory(
@@ -465,10 +452,8 @@ void WebIntentPickerController::DispatchToInstalledExtension(
 
   picker_model_->AddInstalledService(
       service_data.title, service_data.service_url,
-      ConvertDisposition(service_data.disposition));
-  OnServiceChosen(
-      service_data.service_url,
-      ConvertDisposition(service_data.disposition));
+      service_data.disposition);
+  OnServiceChosen(service_data.service_url, service_data.disposition);
   AsyncOperationFinished();
 }
 
@@ -514,7 +499,7 @@ void WebIntentPickerController::AddServiceToModel(
   picker_model_->AddInstalledService(
       service.title,
       service.service_url,
-      ConvertDisposition(service.disposition));
+      service.disposition);
 
   pending_async_count_++;
   FaviconService::Handle handle = favicon_service->GetFaviconForURL(
@@ -829,7 +814,8 @@ void WebIntentPickerController::AsyncOperationFinished() {
 
 void WebIntentPickerController::InvokeService(
     const WebIntentPickerModel::InstalledService& service) {
-  if (service.disposition == WebIntentPickerModel::DISPOSITION_INLINE) {
+  if (service.disposition ==
+      webkit_glue::WebIntentServiceData::DISPOSITION_INLINE) {
     SetDialogState(kPickerMain);
   }
   OnServiceChosen(service.url, service.disposition);

chrome/browser/ui/intents/web_intent_picker_controller.h

@@ -21,6 +21,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/web_intent_reply_data.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 class Browser;
 struct DefaultWebIntentService;
@@ -91,8 +92,9 @@ class WebIntentPickerController
                        const content::NotificationDetails& details) OVERRIDE;
 
   // WebIntentPickerDelegate implementation.
-  virtual void OnServiceChosen(const GURL& url,
-                               Disposition disposition) OVERRIDE;
+  virtual void OnServiceChosen(
+      const GURL& url,
+      webkit_glue::WebIntentServiceData::Disposition disposition) OVERRIDE;
   virtual void OnInlineDispositionWebContentsCreated(
       content::WebContents* web_contents) OVERRIDE;
   virtual void OnExtensionInstallRequested(const std::string& id) OVERRIDE;

chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

@@ -200,8 +200,6 @@ class IntentsDispatcherMock : public content::WebIntentsDispatcher {
 
 class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {
  protected:
-  typedef WebIntentPickerModel::Disposition Disposition;
-
   WebIntentPickerControllerBrowserTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
@@ -306,7 +304,9 @@ class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {
     controller_->OnSendReturnMessage(reply_type);
   }
 
-  void OnServiceChosen(const GURL& url, Disposition disposition) {
+  void OnServiceChosen(
+      const GURL& url,
+      webkit_glue::WebIntentServiceData::Disposition disposition) {
     controller_->OnServiceChosen(url, disposition);
   }
 
@@ -353,7 +353,8 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest, ChooseService) {
   IntentsDispatcherMock dispatcher(intent);
   controller_->SetIntentsDispatcher(&dispatcher);
 
-  OnServiceChosen(kServiceURL2, WebIntentPickerModel::DISPOSITION_WINDOW);
+  OnServiceChosen(kServiceURL2,
+                  webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL2),
             chrome::GetActiveWebContents(browser())->GetURL());
@@ -417,7 +418,8 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest,
   IntentsDispatcherMock dispatcher(intent);
   controller_->SetIntentsDispatcher(&dispatcher);
 
-  OnServiceChosen(kServiceURL1, WebIntentPickerModel::DISPOSITION_WINDOW);
+  OnServiceChosen(kServiceURL1,
+                  webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
   ASSERT_EQ(3, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL1),
             chrome::GetActiveWebContents(browser())->GetURL());

chrome/browser/ui/intents/web_intent_picker_delegate.h

@@ -16,13 +16,13 @@ class WebContents;
 // service.
 class WebIntentPickerDelegate {
  public:
-  typedef WebIntentPickerModel::Disposition Disposition;
-
   // Base destructor.
   virtual ~WebIntentPickerDelegate() {}
 
   // Called when the user has chosen a service.
-  virtual void OnServiceChosen(const GURL& url, Disposition disposition) = 0;
+  virtual void OnServiceChosen(
+      const GURL& url,
+      webkit_glue::WebIntentServiceData::Disposition disposition) = 0;
 
   // Called when the picker has created WebContents to use for inline
   // disposition.

chrome/browser/ui/intents/web_intent_picker_model.cc

@@ -30,9 +30,10 @@ WebIntentPickerModel::~WebIntentPickerModel() {
   DestroyAll();
 }
 
-void WebIntentPickerModel::AddInstalledService(const string16& title,
-                                               const GURL& url,
-                                               Disposition disposition) {
+void WebIntentPickerModel::AddInstalledService(
+    const string16& title,
+    const GURL& url,
+    webkit_glue::WebIntentServiceData::Disposition disposition) {
   // TODO(groby): Revisit to remove O(n^2) complexity.
   for (size_t i = 0; i < installed_services_.size(); ++i) {
     InstalledService* service = installed_services_[i];
@@ -165,7 +166,7 @@ void WebIntentPickerModel::DestroyAll() {
 WebIntentPickerModel::InstalledService::InstalledService(
     const string16& title,
     const GURL& url,
-    Disposition disposition)
+    webkit_glue::WebIntentServiceData::Disposition disposition)
     : title(title),
       url(url),
       favicon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(

chrome/browser/ui/intents/web_intent_picker_model.h

@@ -11,24 +11,19 @@
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/image/image.h"
+#include "webkit/glue/web_intent_service_data.h"
 
 class WebIntentPickerModelObserver;
 
 // Model for the WebIntentPicker.
 class WebIntentPickerModel {
  public:
-  // The intent service disposition.
-  // TODO(gbillock): use the webkit_glue::WebIntentServiceData::Disposition
-  enum Disposition {
-    DISPOSITION_WINDOW,  // Display the intent service in a new window.
-    DISPOSITION_INLINE,  // Display the intent service in the picker.
-  };
-
   // An intent service to display in the picker.
   struct InstalledService {
-    InstalledService(const string16& title,
-                     const GURL& url,
-                     Disposition disposition);
+    InstalledService(
+        const string16& title,
+        const GURL& url,
+        webkit_glue::WebIntentServiceData::Disposition disposition);
     ~InstalledService();
 
     // The title of this service.
@@ -41,7 +36,7 @@ class WebIntentPickerModel {
     gfx::Image favicon;
 
     // The disposition to use when displaying this service.
-    Disposition disposition;
+    webkit_glue::WebIntentServiceData::Disposition disposition;
   };
 
   // A suggested extension to display in the picker.
@@ -84,9 +79,10 @@ class WebIntentPickerModel {
 
   // Add a new installed service with |title|, |url| and |disposition| to the
   // picker.
-  void AddInstalledService(const string16& title,
-                           const GURL& url,
-                           Disposition disposition);
+  void AddInstalledService(
+      const string16& title,
+      const GURL& url,
+      webkit_glue::WebIntentServiceData::Disposition disposition);
 
   // Remove an installed service from the picker at |index|.
   void RemoveInstalledServiceAt(size_t index);

chrome/browser/ui/intents/web_intent_picker_model_unittest.cc

@@ -27,10 +27,10 @@ const string16 kId3(ASCIIToUTF16("aclehenhkckhebbbncbkefhcpcgepcgf"));
 const string16 kId4(ASCIIToUTF16("bclehenhkckhebbbncbkefhcpcgepcgf"));
 const string16 kId5(ASCIIToUTF16("cclehenhkckhebbbncbkefhcpcgepcgf"));
 const string16 kId6(ASCIIToUTF16("dclehenhkckhebbbncbkefhcpcgepcgf"));
-const WebIntentPickerModel::Disposition kWindowDisposition(
-    WebIntentPickerModel::DISPOSITION_WINDOW);
-const WebIntentPickerModel::Disposition kInlineDisposition(
-    WebIntentPickerModel::DISPOSITION_INLINE);
+const webkit_glue::WebIntentServiceData::Disposition kWindowDisposition(
+    webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
+const webkit_glue::WebIntentServiceData::Disposition kInlineDisposition(
+    webkit_glue::WebIntentServiceData::DISPOSITION_INLINE);
 
 }