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

Side by Side Diff: chrome/browser/ui/panels/panel_app_browsertest.cc

Issue 10700130: Introduce LaunchParams struct for opening chrome apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moar cleanup Created 8 years, 5 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) 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 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "chrome/browser/extensions/extension_browsertest.h" 7 #include "chrome/browser/extensions/extension_browsertest.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 EXPECT_TRUE(LoadExtension(test_data_dir_.AppendASCII(name))); 45 EXPECT_TRUE(LoadExtension(test_data_dir_.AppendASCII(name)));
46 46
47 ExtensionService* service = browser()->profile()->GetExtensionService(); 47 ExtensionService* service = browser()->profile()->GetExtensionService();
48 const extensions::Extension* extension = service->GetExtensionById( 48 const extensions::Extension* extension = service->GetExtensionById(
49 last_loaded_extension_id_, false); 49 last_loaded_extension_id_, false);
50 EXPECT_TRUE(extension); 50 EXPECT_TRUE(extension);
51 51
52 PanelManager* manager = PanelManager::GetInstance(); 52 PanelManager* manager = PanelManager::GetInstance();
53 int panel_count = manager->num_panels(); 53 int panel_count = manager->num_panels();
54 54
55 application_launch::OpenApplication( 55 // Overriding manifest to launch in a panel.
56 browser()->profile(), 56 application_launch::OpenApplication(application_launch::LaunchParams(
57 extension, 57 browser()->profile, extension, extension_misc::LAUNCH_PANEL,
58 // Overriding manifest to open in a panel. 58 NEW_WINDOW));
59 extension_misc::LAUNCH_PANEL,
60 GURL(),
61 NEW_WINDOW,
62 NULL);
63 59
64 // Now we have a new browser instance. 60 // Now we have a new browser instance.
65 EXPECT_EQ(panel_count + 1, manager->num_panels()); 61 EXPECT_EQ(panel_count + 1, manager->num_panels());
66 } 62 }
67 63
68 void ClosePanelAndWait(Panel* panel) { 64 void ClosePanelAndWait(Panel* panel) {
69 // Closing a panel window may involve several async tasks. Need to use 65 // Closing a panel window may involve several async tasks. Need to use
70 // message pump and wait for the notification. 66 // message pump and wait for the notification.
71 int panel_count = PanelManager::GetInstance()->num_panels(); 67 int panel_count = PanelManager::GetInstance()->num_panels();
72 ui_test_utils::WindowedNotificationObserver signal( 68 ui_test_utils::WindowedNotificationObserver signal(
(...skipping 23 matching lines...) Expand all
96 EXPECT_EQ(1, panel_manager->num_panels()); 92 EXPECT_EQ(1, panel_manager->num_panels());
97 93
98 Panel* panel = panel_manager->panels()[0]; 94 Panel* panel = panel_manager->panels()[0];
99 ClosePanelAndWait(panel); 95 ClosePanelAndWait(panel);
100 96
101 EXPECT_EQ(0, panel_manager->num_panels()); 97 EXPECT_EQ(0, panel_manager->num_panels());
102 EXPECT_EQ(1u, BrowserList::size()); 98 EXPECT_EQ(1u, BrowserList::size());
103 } 99 }
104 100
105 #endif // OS_MACOSX 101 #endif // OS_MACOSX
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698