summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 16:49:16 +0000
committerstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 16:49:16 +0000
commit1b74d2120db778a1809ddb5ca395e149d75e68f2 (patch)
tree35f7c3b6b8010316d6211e38793d5b4016315642 /chrome/browser/cocoa
parent7c44ec5eac469803e7531e7e604673e536d50753 (diff)
downloadchromium_src-1b74d2120db778a1809ddb5ca395e149d75e68f2.zip
chromium_src-1b74d2120db778a1809ddb5ca395e149d75e68f2.tar.gz
chromium_src-1b74d2120db778a1809ddb5ca395e149d75e68f2.tar.bz2
chromium-os:7243: Fix so that extensions create popup windows of TYPE_APP_POPUP.
Refactor Browser::BuildPopupWindow as Browser::CreatePopupWindow and call it from ExtensionHost::ShowCreatedWindow. BUG=http://code.google.com/p/chromium-os/issues/detail?id=7243 TEST=Test popup windows in general. See issue for specific test case. Review URL: http://codereview.chromium.org/3532011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/applescript/browsercrapplication+applescript_test.mm2
-rw-r--r--chrome/browser/cocoa/browser_window_controller_unittest.mm3
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/applescript/browsercrapplication+applescript_test.mm b/chrome/browser/cocoa/applescript/browsercrapplication+applescript_test.mm
index 2825ef2..e17d102 100644
--- a/chrome/browser/cocoa/applescript/browsercrapplication+applescript_test.mm
+++ b/chrome/browser/cocoa/applescript/browsercrapplication+applescript_test.mm
@@ -19,7 +19,7 @@ typedef InProcessBrowserTest BrowserCrApplicationAppleScriptTest;
IN_PROC_BROWSER_TEST_F(BrowserCrApplicationAppleScriptTest, Creation) {
// Create additional |Browser*| objects of different type.
Profile* profile = browser()->profile();
- Browser* b1 = Browser::CreateForPopup(profile);
+ Browser* b1 = Browser::CreateForType(Browser::TYPE_POPUP, profile);
Browser* b2 = Browser::CreateForApp("", NULL, profile, true);
Browser* b3 = Browser::CreateForApp("", NULL, profile, false);
diff --git a/chrome/browser/cocoa/browser_window_controller_unittest.mm b/chrome/browser/cocoa/browser_window_controller_unittest.mm
index 17886c2..a6fda62 100644
--- a/chrome/browser/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/cocoa/browser_window_controller_unittest.mm
@@ -117,7 +117,8 @@ TEST_F(BrowserWindowControllerTest, TestNormal) {
// And make sure a controller for a pop-up window is not normal.
// popup_browser will be owned by its window.
- Browser *popup_browser(Browser::CreateForPopup(browser_helper_.profile()));
+ Browser *popup_browser(Browser::CreateForType(Browser::TYPE_POPUP,
+ browser_helper_.profile()));
NSWindow *cocoaWindow = popup_browser->window()->GetNativeHandle();
BrowserWindowController* controller =
static_cast<BrowserWindowController*>([cocoaWindow windowController]);