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 #include "ash/wm/frame_painter.h" | 5 #include "ash/wm/frame_painter.h" |
6 | 6 |
7 #include "ash/ash_constants.h" | 7 #include "ash/ash_constants.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
10 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
457 #if defined(OS_WIN) | 457 #if defined(OS_WIN) |
458 // Multiple displays are not supported on Windows Ash. http://crbug.com/165962 | 458 // Multiple displays are not supported on Windows Ash. http://crbug.com/165962 |
459 #define MAYBE_UseSoloWindowHeaderMultiDisplay \ | 459 #define MAYBE_UseSoloWindowHeaderMultiDisplay \ |
460 DISABLED_UseSoloWindowHeaderMultiDisplay | 460 DISABLED_UseSoloWindowHeaderMultiDisplay |
461 #else | 461 #else |
462 #define MAYBE_UseSoloWindowHeaderMultiDisplay \ | 462 #define MAYBE_UseSoloWindowHeaderMultiDisplay \ |
463 UseSoloWindowHeaderMultiDisplay | 463 UseSoloWindowHeaderMultiDisplay |
464 #endif | 464 #endif |
465 | 465 |
466 TEST_F(FramePainterTest, MAYBE_UseSoloWindowHeaderMultiDisplay) { | 466 TEST_F(FramePainterTest, MAYBE_UseSoloWindowHeaderMultiDisplay) { |
| 467 if (!SupportsMultipleDisplays()) |
| 468 return; |
| 469 |
467 UpdateDisplay("1000x600,600x400"); | 470 UpdateDisplay("1000x600,600x400"); |
468 | 471 |
469 // Create two widgets and painters for them. | 472 // Create two widgets and painters for them. |
470 scoped_ptr<Widget> w1(CreateTestWidget()); | 473 scoped_ptr<Widget> w1(CreateTestWidget()); |
471 FramePainter p1; | 474 FramePainter p1; |
472 ImageButton size1(NULL); | 475 ImageButton size1(NULL); |
473 ImageButton close1(NULL); | 476 ImageButton close1(NULL); |
474 p1.Init(w1.get(), NULL, &size1, &close1, FramePainter::SIZE_BUTTON_MAXIMIZES); | 477 p1.Init(w1.get(), NULL, &size1, &close1, FramePainter::SIZE_BUTTON_MAXIMIZES); |
475 w1->SetBounds(gfx::Rect(0, 0, 100, 100)); | 478 w1->SetBounds(gfx::Rect(0, 0, 100, 100)); |
476 w1->Show(); | 479 w1->Show(); |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 SetTrackedByWorkspace(w->GetNativeWindow(), false); | 640 SetTrackedByWorkspace(w->GetNativeWindow(), false); |
638 EXPECT_FALSE(p.ShouldUseMinimalHeaderStyle(FramePainter::THEMED_NO)); | 641 EXPECT_FALSE(p.ShouldUseMinimalHeaderStyle(FramePainter::THEMED_NO)); |
639 SetTrackedByWorkspace(w->GetNativeWindow(), true); | 642 SetTrackedByWorkspace(w->GetNativeWindow(), true); |
640 | 643 |
641 w->GetNativeWindow()->GetRootWindow()->SetProperty( | 644 w->GetNativeWindow()->GetRootWindow()->SetProperty( |
642 ash::internal::kCyclingThroughWorkspacesKey, true); | 645 ash::internal::kCyclingThroughWorkspacesKey, true); |
643 EXPECT_FALSE(p.ShouldUseMinimalHeaderStyle(FramePainter::THEMED_NO)); | 646 EXPECT_FALSE(p.ShouldUseMinimalHeaderStyle(FramePainter::THEMED_NO)); |
644 } | 647 } |
645 | 648 |
646 } // namespace ash | 649 } // namespace ash |
OLD | NEW |