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

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

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_window_tree_host_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
6 6
7 #include <X11/Xlib.h> 7 #include <X11/Xlib.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 } // namespace 122 } // namespace
123 123
124 class DesktopWindowTreeHostX11Test : public ViewsTestBase { 124 class DesktopWindowTreeHostX11Test : public ViewsTestBase {
125 public: 125 public:
126 DesktopWindowTreeHostX11Test() { 126 DesktopWindowTreeHostX11Test() {
127 } 127 }
128 ~DesktopWindowTreeHostX11Test() override {} 128 ~DesktopWindowTreeHostX11Test() override {}
129 129
130 static void SetUpTestCase() { 130 static void SetUpTestCase() {
131 gfx::GLSurfaceTestSupport::InitializeOneOff(); 131 gl::GLSurfaceTestSupport::InitializeOneOff();
132 ui::RegisterPathProvider(); 132 ui::RegisterPathProvider();
133 base::FilePath ui_test_pak_path; 133 base::FilePath ui_test_pak_path;
134 ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); 134 ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
135 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); 135 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
136 } 136 }
137 137
138 // testing::Test 138 // testing::Test
139 void SetUp() override { 139 void SetUp() override {
140 ViewsTestBase::SetUp(); 140 ViewsTestBase::SetUp();
141 141
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 widget->GetInputMethod()->GetTextInputType()); 276 widget->GetInputMethod()->GetTextInputType());
277 277
278 widget->Deactivate(); 278 widget->Deactivate();
279 279
280 EXPECT_FALSE(widget->IsActive()); 280 EXPECT_FALSE(widget->IsActive());
281 EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE, 281 EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
282 widget->GetInputMethod()->GetTextInputType()); 282 widget->GetInputMethod()->GetTextInputType());
283 } 283 }
284 284
285 } // namespace views 285 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/views_test_suite.cc ('k') | ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698