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

Unified Diff: chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm

Issue 11414153: Remove legacy constrained window dialogs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm b/chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm
deleted file mode 100644
index 800bf217483a24ce955b8eaf837a57c3ddcf62a3..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/memory/scoped_ptr.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
-#include "chrome/browser/ui/cocoa/web_intent_picker_cocoa.h"
-#import "chrome/browser/ui/cocoa/web_intent_sheet_controller.h"
-#include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
-#include "chrome/browser/ui/intents/web_intent_picker_delegate_mock.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 WebIntentSheetControllerBrowserTest : public InProcessBrowserTest {
- public:
- void CreateBubble(content::WebContents* web_contents);
- void CreatePicker();
-
- WebIntentPickerSheetController* controller_; // Weak, owns self.
- NSWindow* window_; // Weak, owned by controller.
- scoped_ptr<WebIntentPickerCocoa> picker_;
- WebIntentPickerDelegateMock delegate_;
- WebIntentPickerModel model_; // The model used by the picker
-};
-
-void WebIntentSheetControllerBrowserTest::CreateBubble(
- content::WebContents* web_contents) {
- picker_.reset(new WebIntentPickerCocoa(web_contents, &delegate_, &model_));
-
- controller_ =
- [[WebIntentPickerSheetController alloc] initWithPicker:picker_.get()];
- window_ = [controller_ window];
- [controller_ showWindow:nil];
-}
-
-void WebIntentSheetControllerBrowserTest::CreatePicker() {
- picker_.reset(new WebIntentPickerCocoa());
- picker_->delegate_ = &delegate_;
- picker_->model_ = &model_;
- window_ = nil;
- controller_ = nil;
-}
-
-IN_PROC_BROWSER_TEST_F(WebIntentSheetControllerBrowserTest, CloseWillClose) {
- CreateBubble(chrome::GetActiveWebContents(browser()));
-
- EXPECT_CALL(delegate_, OnUserCancelledPickerDialog()).Times(0);
- EXPECT_CALL(delegate_, OnClosing());
- picker_->Close();
-
- ignore_result(picker_.release()); // Closing |picker_| will destruct it.
-}
-
-IN_PROC_BROWSER_TEST_F(WebIntentSheetControllerBrowserTest,
- DontCancelAfterServiceInvokation) {
- CreateBubble(chrome::GetActiveWebContents(browser()));
-
- GURL url;
- model_.AddInstalledService(string16(), url,
- webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW);
-
- EXPECT_CALL(delegate_, OnServiceChosen(
- url, webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW,
- WebIntentPickerDelegate::kEnableDefaults));
- EXPECT_CALL(delegate_, OnUserCancelledPickerDialog()).Times(0);
- EXPECT_CALL(delegate_, OnClosing());
-
- picker_->OnServiceChosen(0);
- picker_->Close();
-
- ignore_result(picker_.release()); // Closing |picker_| will destruct it.
-}
-
-IN_PROC_BROWSER_TEST_F(WebIntentSheetControllerBrowserTest,
- OnCancelledWillSignalClose) {
- CreatePicker();
- EXPECT_CALL(delegate_, OnUserCancelledPickerDialog());
- EXPECT_CALL(delegate_, OnClosing());
- picker_->OnCancelled();
-
- ignore_result(picker_.release()); // Closing |picker_| will destruct it.
-}

Powered by Google App Engine
This is Rietveld 408576698