| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "blimp/engine/app/ui/blimp_screen.h" | 5 #include "blimp/engine/app/ui/blimp_screen.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/files/file_util.h" | 12 #include "base/files/file_util.h" |
| 13 #include "base/files/scoped_temp_dir.h" | 13 #include "base/files/scoped_temp_dir.h" |
| 14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
| 15 #include "base/strings/stringprintf.h" | 15 #include "base/strings/stringprintf.h" |
| 16 #include "blimp/engine/app/switches.h" | |
| 17 #include "testing/gmock/include/gmock/gmock.h" | 16 #include "testing/gmock/include/gmock/gmock.h" |
| 18 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
| 19 #include "ui/display/display.h" | 18 #include "ui/display/display.h" |
| 20 #include "ui/display/display_observer.h" | 19 #include "ui/display/display_observer.h" |
| 21 #include "ui/display/screen.h" | 20 #include "ui/display/screen.h" |
| 22 | 21 |
| 23 using testing::InSequence; | 22 using testing::InSequence; |
| 24 | 23 |
| 25 namespace blimp { | 24 namespace blimp { |
| 26 namespace engine { | 25 namespace engine { |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics)); | 105 OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics)); |
| 107 | 106 |
| 108 gfx::Size size1(100, 100); | 107 gfx::Size size1(100, 100); |
| 109 screen_->UpdateDisplayScaleAndSize(2.0f, size1); | 108 screen_->UpdateDisplayScaleAndSize(2.0f, size1); |
| 110 EXPECT_EQ(size1, screen_->GetPrimaryDisplay().GetSizeInPixel()); | 109 EXPECT_EQ(size1, screen_->GetPrimaryDisplay().GetSizeInPixel()); |
| 111 } | 110 } |
| 112 | 111 |
| 113 } // namespace | 112 } // namespace |
| 114 } // namespace engine | 113 } // namespace engine |
| 115 } // namespace blimp | 114 } // namespace blimp |
| OLD | NEW |