| 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 #import "chrome/browser/ui/panels/panel_browser_window_cocoa.h" | 5 #import "chrome/browser/ui/panels/panel_browser_window_cocoa.h" |
| 6 | 6 |
| 7 #include <Carbon/Carbon.h> | 7 #include <Carbon/Carbon.h> |
| 8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 | 47 |
| 48 Panel* CreateTestPanel(const std::string& panel_name) { | 48 Panel* CreateTestPanel(const std::string& panel_name) { |
| 49 // Opening panels on a Mac causes NSWindowController of the Panel window | 49 // Opening panels on a Mac causes NSWindowController of the Panel window |
| 50 // to be autoreleased. We need a pool drained after it's done so the test | 50 // to be autoreleased. We need a pool drained after it's done so the test |
| 51 // can close correctly. | 51 // can close correctly. |
| 52 base::mac::ScopedNSAutoreleasePool autorelease_pool; | 52 base::mac::ScopedNSAutoreleasePool autorelease_pool; |
| 53 | 53 |
| 54 PanelManager* manager = PanelManager::GetInstance(); | 54 PanelManager* manager = PanelManager::GetInstance(); |
| 55 int panels_count = manager->num_panels(); | 55 int panels_count = manager->num_panels(); |
| 56 | 56 |
| 57 Browser* panel_browser = Browser::CreateForApp(Browser::TYPE_PANEL, | 57 Browser* panel_browser = Browser::CreateWithParams( |
| 58 panel_name, | 58 Browser::CreateParams::CreateForApp( |
| 59 gfx::Rect(), | 59 Browser::TYPE_PANEL, panel_name, gfx::Rect(), profile())); |
| 60 profile()); | |
| 61 EXPECT_EQ(panels_count + 1, manager->num_panels()); | 60 EXPECT_EQ(panels_count + 1, manager->num_panels()); |
| 62 | 61 |
| 63 Panel* panel = static_cast<Panel*>(panel_browser->window()); | 62 Panel* panel = static_cast<Panel*>(panel_browser->window()); |
| 64 EXPECT_TRUE(panel); | 63 EXPECT_TRUE(panel); |
| 65 EXPECT_TRUE(panel->native_panel()); // Native panel is created right away. | 64 EXPECT_TRUE(panel->native_panel()); // Native panel is created right away. |
| 66 PanelBrowserWindowCocoa* native_window = | 65 PanelBrowserWindowCocoa* native_window = |
| 67 static_cast<PanelBrowserWindowCocoa*>(panel->native_panel()); | 66 static_cast<PanelBrowserWindowCocoa*>(panel->native_panel()); |
| 68 EXPECT_EQ(panel, native_window->panel_); // Back pointer initialized. | 67 EXPECT_EQ(panel, native_window->panel_); // Back pointer initialized. |
| 69 | 68 |
| 70 // Window should not load before Show(). | 69 // Window should not load before Show(). |
| (...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 NSWindow* frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; | 399 NSWindow* frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; |
| 401 EXPECT_NSEQ(frontmostWindow, [native_window->controller_ window]); | 400 EXPECT_NSEQ(frontmostWindow, [native_window->controller_ window]); |
| 402 | 401 |
| 403 native_window2->ActivatePanel(); | 402 native_window2->ActivatePanel(); |
| 404 frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; | 403 frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; |
| 405 EXPECT_NSEQ(frontmostWindow, [native_window2->controller_ window]); | 404 EXPECT_NSEQ(frontmostWindow, [native_window2->controller_ window]); |
| 406 | 405 |
| 407 ClosePanelAndWait(panel->browser()); | 406 ClosePanelAndWait(panel->browser()); |
| 408 ClosePanelAndWait(panel2->browser()); | 407 ClosePanelAndWait(panel2->browser()); |
| 409 } | 408 } |
| OLD | NEW |