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

Side by Side Diff: chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
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::CreateForApp(Browser::TYPE_PANEL, 59 Browser* panel_browser = Browser::CreateForApp(Browser::TYPE_PANEL,
60 panel_name, 60 panel_name,
61 gfx::Rect(), 61 gfx::Rect(),
62 profile()); 62 profile());
63 63
64 TabContentsWrapper* tab_contents = new TabContentsWrapper( 64 TabContentsWrapper* tab_contents = new TabContentsWrapper(
65 new TestTabContents(profile(), NULL)); 65 new TestTabContents(profile(), NULL));
66 panel_browser->AddTab(tab_contents, PageTransition::LINK); 66 panel_browser->AddTab(tab_contents, content::PAGE_TRANSITION_LINK);
67 67
68 // We just created one new panel. 68 // We just created one new panel.
69 EXPECT_EQ(panels_count + 1, manager->num_panels()); 69 EXPECT_EQ(panels_count + 1, manager->num_panels());
70 70
71 Panel* panel = static_cast<Panel*>(panel_browser->window()); 71 Panel* panel = static_cast<Panel*>(panel_browser->window());
72 EXPECT_TRUE(panel); 72 EXPECT_TRUE(panel);
73 EXPECT_TRUE(panel->native_panel()); // Native panel is created right away. 73 EXPECT_TRUE(panel->native_panel()); // Native panel is created right away.
74 PanelBrowserWindowCocoa* native_window = 74 PanelBrowserWindowCocoa* native_window =
75 static_cast<PanelBrowserWindowCocoa*>(panel->native_panel()); 75 static_cast<PanelBrowserWindowCocoa*>(panel->native_panel());
76 EXPECT_EQ(panel, native_window->panel_); // Back pointer initialized. 76 EXPECT_EQ(panel, native_window->panel_); // Back pointer initialized.
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 NSWindow* frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; 396 NSWindow* frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0];
397 EXPECT_NSEQ(frontmostWindow, [native_window->controller_ window]); 397 EXPECT_NSEQ(frontmostWindow, [native_window->controller_ window]);
398 398
399 native_window2->ActivatePanel(); 399 native_window2->ActivatePanel();
400 frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; 400 frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0];
401 EXPECT_NSEQ(frontmostWindow, [native_window2->controller_ window]); 401 EXPECT_NSEQ(frontmostWindow, [native_window2->controller_ window]);
402 402
403 ClosePanelAndWait(panel->browser()); 403 ClosePanelAndWait(panel->browser());
404 ClosePanelAndWait(panel2->browser()); 404 ClosePanelAndWait(panel2->browser());
405 } 405 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/base_panel_browser_test.cc ('k') | chrome/browser/ui/panels/panel_settings_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698