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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 | 49 |
50 Panel* CreateTestPanel(const std::string& panel_name) { | 50 Panel* CreateTestPanel(const std::string& panel_name) { |
51 // Opening panels on a Mac causes NSWindowController of the Panel window | 51 // Opening panels on a Mac causes NSWindowController of the Panel window |
52 // to be autoreleased. We need a pool drained after it's done so the test | 52 // to be autoreleased. We need a pool drained after it's done so the test |
53 // can close correctly. | 53 // can close correctly. |
54 base::mac::ScopedNSAutoreleasePool autorelease_pool; | 54 base::mac::ScopedNSAutoreleasePool autorelease_pool; |
55 | 55 |
56 PanelManager* manager = PanelManager::GetInstance(); | 56 PanelManager* manager = PanelManager::GetInstance(); |
57 int panels_count = manager->num_panels(); | 57 int panels_count = manager->num_panels(); |
58 | 58 |
59 Browser* panel_browser = Browser::CreateWithParams( | 59 Browser* panel_browser = new Browser(Browser::CreateParams::CreateForApp( |
60 Browser::CreateParams::CreateForApp( | 60 Browser::TYPE_PANEL, panel_name, gfx::Rect(), profile())); |
61 Browser::TYPE_PANEL, panel_name, gfx::Rect(), profile())); | |
62 EXPECT_EQ(panels_count + 1, manager->num_panels()); | 61 EXPECT_EQ(panels_count + 1, manager->num_panels()); |
63 | 62 |
64 PanelBrowserWindow* panel_browser_window = | 63 PanelBrowserWindow* panel_browser_window = |
65 static_cast<PanelBrowserWindow*>(panel_browser->window()); | 64 static_cast<PanelBrowserWindow*>(panel_browser->window()); |
66 Panel* panel = panel_browser_window->panel(); | 65 Panel* panel = panel_browser_window->panel(); |
67 EXPECT_TRUE(panel); | 66 EXPECT_TRUE(panel); |
68 EXPECT_TRUE(panel->native_panel()); // Native panel is created right away. | 67 EXPECT_TRUE(panel->native_panel()); // Native panel is created right away. |
69 PanelBrowserWindowCocoa* native_window = | 68 PanelBrowserWindowCocoa* native_window = |
70 static_cast<PanelBrowserWindowCocoa*>(panel->native_panel()); | 69 static_cast<PanelBrowserWindowCocoa*>(panel->native_panel()); |
71 EXPECT_EQ(panel, native_window->panel_); // Back pointer initialized. | 70 EXPECT_EQ(panel, native_window->panel_); // Back pointer initialized. |
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
411 NSWindow* frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; | 410 NSWindow* frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; |
412 EXPECT_NSEQ(frontmostWindow, [native_window->controller_ window]); | 411 EXPECT_NSEQ(frontmostWindow, [native_window->controller_ window]); |
413 | 412 |
414 native_window2->ActivatePanel(); | 413 native_window2->ActivatePanel(); |
415 frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; | 414 frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; |
416 EXPECT_NSEQ(frontmostWindow, [native_window2->controller_ window]); | 415 EXPECT_NSEQ(frontmostWindow, [native_window2->controller_ window]); |
417 | 416 |
418 ClosePanelAndWait(panel); | 417 ClosePanelAndWait(panel); |
419 ClosePanelAndWait(panel2); | 418 ClosePanelAndWait(panel2); |
420 } | 419 } |
OLD | NEW |