OLD | NEW |
---|---|
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 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "chrome/browser/extensions/extension_service.h" | 6 #include "chrome/browser/extensions/extension_service.h" |
7 #include "chrome/browser/prefs/pref_service.h" | 7 #include "chrome/browser/prefs/pref_service.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/browser_list.h" | 10 #include "chrome/browser/ui/browser_list.h" |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
297 #ifdef OS_MACOSX | 297 #ifdef OS_MACOSX |
298 #define MAYBE_CreatePanelOnOverflow DISABLED_CreatePanelOnOverflow | 298 #define MAYBE_CreatePanelOnOverflow DISABLED_CreatePanelOnOverflow |
299 #else | 299 #else |
300 #define MAYBE_CreatePanelOnOverflow CreatePanelOnOverflow | 300 #define MAYBE_CreatePanelOnOverflow CreatePanelOnOverflow |
301 #endif | 301 #endif |
302 | 302 |
303 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_CreatePanelOnOverflow) { | 303 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_CreatePanelOnOverflow) { |
304 TestCreatePanelOnOverflow(); | 304 TestCreatePanelOnOverflow(); |
305 } | 305 } |
306 | 306 |
307 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(TOOLKIT_VIEWS) | 307 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) || \ |
308 (!defined(OS_WIN) && defined(TOOLKIT_VIEWS)) | |
scherkus (not reviewing)
2011/08/16 23:29:12
drive-by... I wonder if you could re-write this to
prasadt
2011/08/16 23:40:26
Jenn suggested that and I thought about that too b
| |
308 #define MAYBE_DragPanels DISABLED_DragPanels | 309 #define MAYBE_DragPanels DISABLED_DragPanels |
309 #else | 310 #else |
310 #define MAYBE_DragPanels DragPanels | 311 #define MAYBE_DragPanels DragPanels |
311 #endif | 312 #endif |
312 | 313 |
313 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_DragPanels) { | 314 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_DragPanels) { |
314 std::vector<Panel*> panels; | 315 std::vector<Panel*> panels; |
315 panels.push_back(CreatePanel("PanelTest0", gfx::Rect())); | 316 panels.push_back(CreatePanel("PanelTest0", gfx::Rect())); |
316 | 317 |
317 int small_delta = 5; | 318 int small_delta = 5; |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
501 EXPECT_EQ(1, tabbed_browser->tab_count()); | 502 EXPECT_EQ(1, tabbed_browser->tab_count()); |
502 ASSERT_TRUE(tabbed_browser->window()->IsDownloadShelfVisible()); | 503 ASSERT_TRUE(tabbed_browser->window()->IsDownloadShelfVisible()); |
503 tabbed_browser->CloseWindow(); | 504 tabbed_browser->CloseWindow(); |
504 #endif | 505 #endif |
505 | 506 |
506 EXPECT_EQ(1, panel_browser->tab_count()); | 507 EXPECT_EQ(1, panel_browser->tab_count()); |
507 ASSERT_FALSE(panel_browser->window()->IsDownloadShelfVisible()); | 508 ASSERT_FALSE(panel_browser->window()->IsDownloadShelfVisible()); |
508 | 509 |
509 panel_browser->CloseWindow(); | 510 panel_browser->CloseWindow(); |
510 } | 511 } |
OLD | NEW |