Remove legacy constrained window dialogs

This CL removes the following legacy constrained window dialogs: - TabModalConfirmDialogMac, replaced by TabModalConfirmDialogMac2 - WebIntentPickerCocoa, replaced by WebIntentPickerCocoa2 BUG= TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/11414153 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169607 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Nov 27, 2012 · 4537a72 · 4537a72
1 parent b72dfbc
commit 4537a72
Show file tree

Hide file tree

Showing 19 changed files with 74 additions and 2,157 deletions.
diff --git a/chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.h b/chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.h
@@ -16,12 +16,12 @@ namespace content {
 class WebContents;
 }
 class WebIntentInlineDispositionDelegate;
-class WebIntentPickerCocoa2;
+class WebIntentPickerCocoa;
 
 // The inline service view shows a web view for a given service.
 @interface WebIntentInlineServiceViewController : WebIntentViewController {
  @private
-  WebIntentPickerCocoa2* picker_;  // weak
+  WebIntentPickerCocoa* picker_;  // weak
   scoped_nsobject<NSImageView> serviceIconImageView_;
   scoped_nsobject<NSTextField> serviceNameTextField_;
   scoped_nsobject<NSButton> chooseServiceButton_;
@@ -34,7 +34,7 @@ class WebIntentPickerCocoa2;
   scoped_ptr<WebIntentInlineDispositionDelegate> delegate_;
 }
 
-- (id)initWithPicker:(WebIntentPickerCocoa2*)picker;
+- (id)initWithPicker:(WebIntentPickerCocoa*)picker;
 
 - (NSButton*)chooseServiceButton;
 - (content::WebContents*)webContents;

diff --git a/chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.mm b/chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.mm
@@ -8,7 +8,7 @@
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_utils.h"
 #import "chrome/browser/ui/cocoa/flipped_view.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
-#import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa2.h"
+#import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa.h"
 #include "chrome/browser/ui/constrained_window.h"
 #include "chrome/browser/ui/constrained_window_constants.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
@@ -21,7 +21,7 @@
 
 @implementation WebIntentInlineServiceViewController
 
-- (id)initWithPicker:(WebIntentPickerCocoa2*)picker {
+- (id)initWithPicker:(WebIntentPickerCocoa*)picker {
   if ((self = [super init])) {
     picker_ = picker;
 

diff --git a/chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller_browsertest.mm b/chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller_browsertest.mm
@@ -6,7 +6,7 @@
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
-#import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa2.h"
+#import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate_mock.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -29,7 +29,7 @@
   virtual void SetUpOnMainThread() OVERRIDE {
     content::WebContents* tab =
         browser()->tab_strip_model()->GetWebContentsAt(0);
-    picker_ = new WebIntentPickerCocoa2(tab, &delegate_, &model_);
+    picker_ = new WebIntentPickerCocoa(tab, &delegate_, &model_);
     view_controller_.reset(
         [[WebIntentInlineServiceViewController alloc] initWithPicker:picker_]);
     view_.reset([[view_controller_ view] retain]);
@@ -49,7 +49,7 @@ virtual void CleanUpOnMainThread() OVERRIDE {
   scoped_nsobject<WebIntentInlineServiceViewController> view_controller_;
   WebIntentPickerDelegateMock delegate_;
   WebIntentPickerModel model_;
-  WebIntentPickerCocoa2* picker_;
+  WebIntentPickerCocoa* picker_;
 };
 
 IN_PROC_BROWSER_TEST_F(WebIntentInlineServiceViewControllerTest, Layout) {

diff --git a/.../cocoa/intents/web_intent_picker_cocoa2.h → ...i/cocoa/intents/web_intent_picker_cocoa.h b/.../cocoa/intents/web_intent_picker_cocoa2.h → ...i/cocoa/intents/web_intent_picker_cocoa.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_COCOA_INTENTS_WEB_INTENT_PICKER_COCOA2_H_
-#define CHROME_BROWSER_UI_COCOA_INTENTS_WEB_INTENT_PICKER_COCOA2_H_
+#ifndef CHROME_BROWSER_UI_COCOA_INTENTS_WEB_INTENT_PICKER_COCOA_H_
+#define CHROME_BROWSER_UI_COCOA_INTENTS_WEB_INTENT_PICKER_COCOA_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -15,16 +15,15 @@
 @class WebIntentPickerViewController;
 
 // An implementation of WebIntentPicker for Cocoa. Bridges between the C++ and
-// the Cocoa WebIntentPickerViewController object.  Note, this will eventually
-// replace WebIntentPickerCocoa, see http://crbug.com/152010.
-class WebIntentPickerCocoa2 : public WebIntentPicker,
-                              public WebIntentPickerModelObserver,
-                              public ConstrainedWindowMacDelegate2 {
+// the Cocoa WebIntentPickerViewController object.
+class WebIntentPickerCocoa : public WebIntentPicker,
+                             public WebIntentPickerModelObserver,
+                             public ConstrainedWindowMacDelegate2 {
  public:
-  WebIntentPickerCocoa2(content::WebContents* web_contents,
-                        WebIntentPickerDelegate* delegate,
-                        WebIntentPickerModel* model);
-  virtual ~WebIntentPickerCocoa2();
+  WebIntentPickerCocoa(content::WebContents* web_contents,
+                       WebIntentPickerDelegate* delegate,
+                       WebIntentPickerModel* model);
+  virtual ~WebIntentPickerCocoa();
 
   WebIntentPickerDelegate* delegate() const {
     DCHECK(delegate_);
@@ -81,7 +80,7 @@ class WebIntentPickerCocoa2 : public WebIntentPicker,
   scoped_nsobject<WebIntentPickerViewController> view_controller_;
   scoped_ptr<ConstrainedWindowMac2> constrained_window_;
   bool update_pending_;
-  base::WeakPtrFactory<WebIntentPickerCocoa2> weak_ptr_factory_;
+  base::WeakPtrFactory<WebIntentPickerCocoa> weak_ptr_factory_;
 };
 
-#endif  // CHROME_BROWSER_UI_COCOA_INTENTS_WEB_INTENT_PICKER_COCOA2_H_
+#endif  // CHROME_BROWSER_UI_COCOA_INTENTS_WEB_INTENT_PICKER_COCOA_H_
diff --git a/...cocoa/intents/web_intent_picker_cocoa2.mm → .../cocoa/intents/web_intent_picker_cocoa.mm b/...cocoa/intents/web_intent_picker_cocoa2.mm → .../cocoa/intents/web_intent_picker_cocoa.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa2.h"
+#import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa.h"
 
 #include <Cocoa/Cocoa.h>
 
@@ -16,9 +16,16 @@
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 
-WebIntentPickerCocoa2::WebIntentPickerCocoa2(content::WebContents* web_contents,
-                                             WebIntentPickerDelegate* delegate,
-                                             WebIntentPickerModel* model)
+// static
+WebIntentPicker* WebIntentPicker::Create(content::WebContents* web_contents,
+                                         WebIntentPickerDelegate* delegate,
+                                         WebIntentPickerModel* model) {
+  return new WebIntentPickerCocoa(web_contents, delegate, model);
+}
+
+WebIntentPickerCocoa::WebIntentPickerCocoa(content::WebContents* web_contents,
+                                           WebIntentPickerDelegate* delegate,
+                                           WebIntentPickerModel* model)
     : web_contents_(web_contents),
       delegate_(delegate),
       model_(model),
@@ -38,38 +45,38 @@
       this, web_contents, window));
 }
 
-WebIntentPickerCocoa2::~WebIntentPickerCocoa2() {
+WebIntentPickerCocoa::~WebIntentPickerCocoa() {
 }
 
-void WebIntentPickerCocoa2::Close() {
+void WebIntentPickerCocoa::Close() {
   constrained_window_->CloseConstrainedWindow();
 }
 
-void WebIntentPickerCocoa2::SetActionString(const string16& action) {
+void WebIntentPickerCocoa::SetActionString(const string16& action) {
   // Ignored. Action string is retrieved from the model.
 }
 
-void WebIntentPickerCocoa2::OnExtensionInstallSuccess(const std::string& id) {
+void WebIntentPickerCocoa::OnExtensionInstallSuccess(const std::string& id) {
   ScheduleUpdate();
 }
 
-void WebIntentPickerCocoa2::OnExtensionInstallFailure(const std::string& id) {
+void WebIntentPickerCocoa::OnExtensionInstallFailure(const std::string& id) {
   ScheduleUpdate();
 }
 
-void WebIntentPickerCocoa2::OnShowExtensionInstallDialog(
+void WebIntentPickerCocoa::OnShowExtensionInstallDialog(
       content::WebContents* parent_web_contents,
       ExtensionInstallPrompt::Delegate* delegate,
       const ExtensionInstallPrompt::Prompt& prompt) {
   ScheduleUpdate();
 }
 
-void WebIntentPickerCocoa2::OnInlineDispositionAutoResize(
+void WebIntentPickerCocoa::OnInlineDispositionAutoResize(
     const gfx::Size& size) {
   ScheduleUpdate();
 }
 
-void WebIntentPickerCocoa2::OnInlineDispositionHandleKeyboardEvent(
+void WebIntentPickerCocoa::OnInlineDispositionHandleKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   if (event.skip_in_browser ||
       event.type == content::NativeWebKeyboardEvent::Char) {
@@ -81,44 +88,44 @@
   [window redispatchKeyEvent:event.os_event];
 }
 
-void WebIntentPickerCocoa2::OnPendingAsyncCompleted() {
+void WebIntentPickerCocoa::OnPendingAsyncCompleted() {
   ScheduleUpdate();
 }
 
-void WebIntentPickerCocoa2::InvalidateDelegate() {
+void WebIntentPickerCocoa::InvalidateDelegate() {
   delegate_ = NULL;
 }
 
-void WebIntentPickerCocoa2::OnInlineDispositionWebContentsLoaded(
+void WebIntentPickerCocoa::OnInlineDispositionWebContentsLoaded(
     content::WebContents* web_contents) {
   ScheduleUpdate();
 }
 
-gfx::Size WebIntentPickerCocoa2::GetMinInlineDispositionSize() {
+gfx::Size WebIntentPickerCocoa::GetMinInlineDispositionSize() {
   return [view_controller_ minimumInlineWebViewSize];
 }
 
-void WebIntentPickerCocoa2::OnModelChanged(WebIntentPickerModel* model) {
+void WebIntentPickerCocoa::OnModelChanged(WebIntentPickerModel* model) {
   ScheduleUpdate();
 }
 
-void WebIntentPickerCocoa2::OnFaviconChanged(WebIntentPickerModel* model,
+void WebIntentPickerCocoa::OnFaviconChanged(WebIntentPickerModel* model,
                                              size_t index) {
   ScheduleUpdate();
 }
 
-void WebIntentPickerCocoa2::OnExtensionIconChanged(
+void WebIntentPickerCocoa::OnExtensionIconChanged(
     WebIntentPickerModel* model,
     const std::string& extension_id) {
   ScheduleUpdate();
 }
 
-void WebIntentPickerCocoa2::OnInlineDisposition(const string16& title,
+void WebIntentPickerCocoa::OnInlineDisposition(const string16& title,
                                                 const GURL& url) {
   ScheduleUpdate();
 }
 
-void WebIntentPickerCocoa2::OnConstrainedWindowClosed(
+void WebIntentPickerCocoa::OnConstrainedWindowClosed(
     ConstrainedWindowMac2* window) {
   // After the OnClosing call the model may be deleted so unset this reference.
   model_->set_observer(NULL);
@@ -130,17 +137,17 @@
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
-void WebIntentPickerCocoa2::ScheduleUpdate() {
+void WebIntentPickerCocoa::ScheduleUpdate() {
   if (update_pending_)
     return;
   update_pending_ = true;
   MessageLoop::current()->PostTask(
       FROM_HERE,
-      base::Bind(&WebIntentPickerCocoa2::PerformUpdate,
+      base::Bind(&WebIntentPickerCocoa::PerformUpdate,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-void WebIntentPickerCocoa2::PerformUpdate() {
+void WebIntentPickerCocoa::PerformUpdate() {
   update_pending_ = false;
   [view_controller_ update];
 }
diff --git a/chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller.h b/chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_nsobject.h"
 #include "ui/gfx/size.h"
 
-class WebIntentPickerCocoa2;
+class WebIntentPickerCocoa;
 @class WebIntentChooseServiceViewController;
 @class WebIntentExtensionPromptViewController;
 @class WebIntentInlineServiceViewController;
@@ -31,7 +31,7 @@ enum WebIntentPickerState {
 // a constrained window or a bubble.
 @interface WebIntentPickerViewController : NSViewController {
  @private
-  WebIntentPickerCocoa2* picker_;  // weak
+  WebIntentPickerCocoa* picker_;  // weak
   WebIntentPickerState state_;
   scoped_nsobject<NSButton> closeButton_;
   scoped_nsobject<WebIntentChooseServiceViewController>
@@ -46,7 +46,7 @@ enum WebIntentPickerState {
       extensionPromptViewController_;
 }
 
-- (id)initWithPicker:(WebIntentPickerCocoa2*)picker;
+- (id)initWithPicker:(WebIntentPickerCocoa*)picker;
 
 // Gets the minimum size of the web view shown inside picker dialog.
 - (gfx::Size)minimumInlineWebViewSize;

diff --git a/chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller.mm b/chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller.mm
@@ -12,7 +12,7 @@
 #import "chrome/browser/ui/cocoa/intents/web_intent_extension_prompt_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_message_view_controller.h"
-#import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa2.h"
+#import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_progress_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_service_row_view_controller.h"
 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
@@ -58,7 +58,7 @@ - (void)onChooseAnotherService:(id)sender;
 
 @implementation WebIntentPickerViewController
 
-- (id)initWithPicker:(WebIntentPickerCocoa2*)picker {
+- (id)initWithPicker:(WebIntentPickerCocoa*)picker {
   if ((self = [super init])) {
     picker_ = picker;
 

diff --git a/chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller_browsertest.mm b/chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller_browsertest.mm
@@ -13,7 +13,7 @@
 #import "chrome/browser/ui/cocoa/intents/web_intent_extension_prompt_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_message_view_controller.h"
-#import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa2.h"
+#import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_progress_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_service_row_view_controller.h"
@@ -42,7 +42,7 @@
   virtual void SetUpOnMainThread() OVERRIDE {
     content::WebContents* tab =
         browser()->tab_strip_model()->GetWebContentsAt(0);
-    picker_ = new WebIntentPickerCocoa2(tab, &delegate_, &model_);
+    picker_ = new WebIntentPickerCocoa(tab, &delegate_, &model_);
     controller_ = picker_->view_controller();
   }
 
@@ -54,7 +54,7 @@ virtual void CleanUpOnMainThread() OVERRIDE {
  protected:
   WebIntentPickerDelegateMock delegate_;
   WebIntentPickerModel model_;
-  WebIntentPickerCocoa2* picker_;  // weak
+  WebIntentPickerCocoa* picker_;  // weak
   WebIntentPickerViewController* controller_;  // weak
 };