| 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 "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 6 #include "chrome/test/base/in_process_browser_test.h" | 6 #include "chrome/test/base/in_process_browser_test.h" |
| 7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 8 #include "chrome/browser/ui/cocoa/web_intent_picker_cocoa.h" | 8 #include "chrome/browser/ui/cocoa/web_intent_picker_cocoa.h" |
| 9 #import "chrome/browser/ui/cocoa/web_intent_sheet_controller.h" | 9 #import "chrome/browser/ui/cocoa/web_intent_sheet_controller.h" |
| 10 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h" | 10 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 WebIntentPickerSheetController* controller_; // Weak, owns self. | 34 WebIntentPickerSheetController* controller_; // Weak, owns self. |
| 35 NSWindow* window_; // Weak, owned by controller. | 35 NSWindow* window_; // Weak, owned by controller. |
| 36 scoped_ptr<WebIntentPickerCocoa> picker_; | 36 scoped_ptr<WebIntentPickerCocoa> picker_; |
| 37 MockIntentPickerDelegate delegate_; | 37 MockIntentPickerDelegate delegate_; |
| 38 WebIntentPickerModel model_; // The model used by the picker | 38 WebIntentPickerModel model_; // The model used by the picker |
| 39 }; | 39 }; |
| 40 | 40 |
| 41 void WebIntentSheetControllerBrowserTest::CreateBubble( | 41 void WebIntentSheetControllerBrowserTest::CreateBubble( |
| 42 TabContentsWrapper* wrapper) { | 42 TabContentsWrapper* wrapper) { |
| 43 picker_.reset(new WebIntentPickerCocoa(NULL, wrapper, &delegate_, &model_)); | 43 picker_.reset(new WebIntentPickerCocoa(wrapper, &delegate_, &model_)); |
| 44 | 44 |
| 45 controller_ = | 45 controller_ = |
| 46 [[WebIntentPickerSheetController alloc] initWithPicker:picker_.get()]; | 46 [[WebIntentPickerSheetController alloc] initWithPicker:picker_.get()]; |
| 47 window_ = [controller_ window]; | 47 window_ = [controller_ window]; |
| 48 [controller_ showWindow:nil]; | 48 [controller_ showWindow:nil]; |
| 49 } | 49 } |
| 50 | 50 |
| 51 void WebIntentSheetControllerBrowserTest::CreatePicker() { | 51 void WebIntentSheetControllerBrowserTest::CreatePicker() { |
| 52 picker_.reset(new WebIntentPickerCocoa()); | 52 picker_.reset(new WebIntentPickerCocoa()); |
| 53 picker_->delegate_ = &delegate_; | 53 picker_->delegate_ = &delegate_; |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 | 87 |
| 88 IN_PROC_BROWSER_TEST_F(WebIntentSheetControllerBrowserTest, | 88 IN_PROC_BROWSER_TEST_F(WebIntentSheetControllerBrowserTest, |
| 89 OnCancelledWillSignalClose) { | 89 OnCancelledWillSignalClose) { |
| 90 CreatePicker(); | 90 CreatePicker(); |
| 91 EXPECT_CALL(delegate_, OnCancelled()); | 91 EXPECT_CALL(delegate_, OnCancelled()); |
| 92 EXPECT_CALL(delegate_, OnClosing()); | 92 EXPECT_CALL(delegate_, OnClosing()); |
| 93 picker_->OnCancelled(); | 93 picker_->OnCancelled(); |
| 94 | 94 |
| 95 ignore_result(picker_.release()); // Closing |picker_| will destruct it. | 95 ignore_result(picker_.release()); // Closing |picker_| will destruct it. |
| 96 } | 96 } |
| OLD | NEW |