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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/views/widget/desktop_aura/desktop_screen_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_screen_x11.h"
6 6
7 #include <stdint.h>
8
9 #include "base/macros.h"
7 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
8 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/aura/client/aura_constants.h" 12 #include "ui/aura/client/aura_constants.h"
10 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
11 #include "ui/aura/window_event_dispatcher.h" 14 #include "ui/aura/window_event_dispatcher.h"
12 #include "ui/base/hit_test.h" 15 #include "ui/base/hit_test.h"
13 #include "ui/base/x/x11_util.h" 16 #include "ui/base/x/x11_util.h"
14 #include "ui/events/test/event_generator.h" 17 #include "ui/events/test/event_generator.h"
15 #include "ui/gfx/display_observer.h" 18 #include "ui/gfx/display_observer.h"
16 #include "ui/gfx/x/x11_types.h" 19 #include "ui/gfx/x/x11_types.h"
(...skipping 24 matching lines...) Expand all
41 private: 44 private:
42 int window_component_; 45 int window_component_;
43 46
44 DISALLOW_COPY_AND_ASSIGN(TestDesktopNativeWidgetAura); 47 DISALLOW_COPY_AND_ASSIGN(TestDesktopNativeWidgetAura);
45 }; 48 };
46 49
47 } // namespace 50 } // namespace
48 51
49 namespace views { 52 namespace views {
50 53
51 const int64 kFirstDisplay = 5321829; 54 const int64_t kFirstDisplay = 5321829;
52 const int64 kSecondDisplay = 928310; 55 const int64_t kSecondDisplay = 928310;
53 56
54 class DesktopScreenX11Test : public views::ViewsTestBase, 57 class DesktopScreenX11Test : public views::ViewsTestBase,
55 public gfx::DisplayObserver { 58 public gfx::DisplayObserver {
56 public: 59 public:
57 DesktopScreenX11Test() {} 60 DesktopScreenX11Test() {}
58 ~DesktopScreenX11Test() override {} 61 ~DesktopScreenX11Test() override {}
59 62
60 // Overridden from testing::Test: 63 // Overridden from testing::Test:
61 void SetUp() override { 64 void SetUp() override {
62 ViewsTestBase::SetUp(); 65 ViewsTestBase::SetUp();
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 NotifyDisplaysChanged(displays); 452 NotifyDisplaysChanged(displays);
450 EXPECT_EQ(2u, changed_display_.size()); 453 EXPECT_EQ(2u, changed_display_.size());
451 454
452 displays[0].set_device_scale_factor(1.f); 455 displays[0].set_device_scale_factor(1.f);
453 displays[1].set_device_scale_factor(1.f); 456 displays[1].set_device_scale_factor(1.f);
454 NotifyDisplaysChanged(displays); 457 NotifyDisplaysChanged(displays);
455 EXPECT_EQ(4u, changed_display_.size()); 458 EXPECT_EQ(4u, changed_display_.size());
456 } 459 }
457 460
458 } // namespace views 461 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698