chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller_browsertest.mm - Issue 11414153: Remove legacy constrained window dialogs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_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

« no previous file with comments | « chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.mm ('k') | chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller_browsertest.mm

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

index d5964afd3671a5516249a39d1f70c7272ea2a7f5..1c3d4e765574e5654749e2bfd38e96958dad876c 100644

--- 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 @@ class WebIntentInlineServiceViewControllerTest : public InProcessBrowserTest {

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 @@ class WebIntentInlineServiceViewControllerTest : public InProcessBrowserTest {

scoped_nsobject<WebIntentInlineServiceViewController> view_controller_;

WebIntentPickerDelegateMock delegate_;

WebIntentPickerModel model_;

- WebIntentPickerCocoa2* picker_;

+ WebIntentPickerCocoa* picker_;

};

IN_PROC_BROWSER_TEST_F(WebIntentInlineServiceViewControllerTest, Layout) {