| 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 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 468 #if defined(OS_WIN) | 468 #if defined(OS_WIN) |
| 469 // Multiple displays are not supported on Windows Ash. http://crbug.com/165962 | 469 // Multiple displays are not supported on Windows Ash. http://crbug.com/165962 |
| 470 #define MAYBE_UseSoloWindowHeaderMultiDisplay \ | 470 #define MAYBE_UseSoloWindowHeaderMultiDisplay \ |
| 471 DISABLED_UseSoloWindowHeaderMultiDisplay | 471 DISABLED_UseSoloWindowHeaderMultiDisplay |
| 472 #else | 472 #else |
| 473 #define MAYBE_UseSoloWindowHeaderMultiDisplay \ | 473 #define MAYBE_UseSoloWindowHeaderMultiDisplay \ |
| 474 UseSoloWindowHeaderMultiDisplay | 474 UseSoloWindowHeaderMultiDisplay |
| 475 #endif | 475 #endif |
| 476 | 476 |
| 477 TEST_F(FramePainterTest, MAYBE_UseSoloWindowHeaderMultiDisplay) { | 477 TEST_F(FramePainterTest, MAYBE_UseSoloWindowHeaderMultiDisplay) { |
| 478 if (!SupportsMultipleDisplays()) |
| 479 return; |
| 480 |
| 478 UpdateDisplay("1000x600,600x400"); | 481 UpdateDisplay("1000x600,600x400"); |
| 479 | 482 |
| 480 // Create two widgets and painters for them. | 483 // Create two widgets and painters for them. |
| 481 scoped_ptr<Widget> w1(CreateTestWidget()); | 484 scoped_ptr<Widget> w1(CreateTestWidget()); |
| 482 FramePainter p1; | 485 FramePainter p1; |
| 483 ImageButton size1(NULL); | 486 ImageButton size1(NULL); |
| 484 ImageButton close1(NULL); | 487 ImageButton close1(NULL); |
| 485 p1.Init(w1.get(), NULL, &size1, &close1, FramePainter::SIZE_BUTTON_MAXIMIZES); | 488 p1.Init(w1.get(), NULL, &size1, &close1, FramePainter::SIZE_BUTTON_MAXIMIZES); |
| 486 w1->SetBounds(gfx::Rect(0, 0, 100, 100)); | 489 w1->SetBounds(gfx::Rect(0, 0, 100, 100)); |
| 487 w1->Show(); | 490 w1->Show(); |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 648 SetTrackedByWorkspace(w->GetNativeWindow(), false); | 651 SetTrackedByWorkspace(w->GetNativeWindow(), false); |
| 649 EXPECT_FALSE(p.ShouldUseMinimalHeaderStyle(FramePainter::THEMED_NO)); | 652 EXPECT_FALSE(p.ShouldUseMinimalHeaderStyle(FramePainter::THEMED_NO)); |
| 650 SetTrackedByWorkspace(w->GetNativeWindow(), true); | 653 SetTrackedByWorkspace(w->GetNativeWindow(), true); |
| 651 | 654 |
| 652 w->GetNativeWindow()->GetRootWindow()->SetProperty( | 655 w->GetNativeWindow()->GetRootWindow()->SetProperty( |
| 653 ash::internal::kCyclingThroughWorkspacesKey, true); | 656 ash::internal::kCyclingThroughWorkspacesKey, true); |
| 654 EXPECT_FALSE(p.ShouldUseMinimalHeaderStyle(FramePainter::THEMED_NO)); | 657 EXPECT_FALSE(p.ShouldUseMinimalHeaderStyle(FramePainter::THEMED_NO)); |
| 655 } | 658 } |
| 656 | 659 |
| 657 } // namespace ash | 660 } // namespace ash |
| OLD | NEW |