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

Side by Side Diff: ui/views/widget/widget_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 (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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 274
275 class WidgetTestInteractive : public WidgetTest { 275 class WidgetTestInteractive : public WidgetTest {
276 public: 276 public:
277 WidgetTestInteractive() {} 277 WidgetTestInteractive() {}
278 ~WidgetTestInteractive() override {} 278 ~WidgetTestInteractive() override {}
279 279
280 void SetUp() override { 280 void SetUp() override {
281 // On mus these tests run as part of views::ViewsTestSuite which already 281 // On mus these tests run as part of views::ViewsTestSuite which already
282 // does this initialization. 282 // does this initialization.
283 if (!IsMus()) { 283 if (!IsMus()) {
284 gfx::GLSurfaceTestSupport::InitializeOneOff(); 284 gl::GLSurfaceTestSupport::InitializeOneOff();
285 ui::RegisterPathProvider(); 285 ui::RegisterPathProvider();
286 base::FilePath ui_test_pak_path; 286 base::FilePath ui_test_pak_path;
287 ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); 287 ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
288 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); 288 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
289 } 289 }
290 WidgetTest::SetUp(); 290 WidgetTest::SetUp();
291 } 291 }
292 292
293 protected: 293 protected:
294 #if defined(USE_AURA) 294 #if defined(USE_AURA)
(...skipping 1002 matching lines...) Expand 10 before | Expand all | Expand 10 after
1297 public: 1297 public:
1298 WidgetCaptureTest() { 1298 WidgetCaptureTest() {
1299 } 1299 }
1300 1300
1301 ~WidgetCaptureTest() override {} 1301 ~WidgetCaptureTest() override {}
1302 1302
1303 void SetUp() override { 1303 void SetUp() override {
1304 // On mus these tests run as part of views::ViewsTestSuite which already 1304 // On mus these tests run as part of views::ViewsTestSuite which already
1305 // does this initialization. 1305 // does this initialization.
1306 if (!IsMus()) { 1306 if (!IsMus()) {
1307 gfx::GLSurfaceTestSupport::InitializeOneOff(); 1307 gl::GLSurfaceTestSupport::InitializeOneOff();
1308 ui::RegisterPathProvider(); 1308 ui::RegisterPathProvider();
1309 base::FilePath ui_test_pak_path; 1309 base::FilePath ui_test_pak_path;
1310 ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); 1310 ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
1311 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); 1311 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
1312 } 1312 }
1313 ViewsTestBase::SetUp(); 1313 ViewsTestBase::SetUp();
1314 } 1314 }
1315 1315
1316 // Verifies Widget::SetCapture() results in updating native capture along with 1316 // Verifies Widget::SetCapture() results in updating native capture along with
1317 // invoking the right Widget function. 1317 // invoking the right Widget function.
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
1794 1794
1795 ui::KeyEvent key_event2(key_event); 1795 ui::KeyEvent key_event2(key_event);
1796 widget->OnKeyEvent(&key_event2); 1796 widget->OnKeyEvent(&key_event2);
1797 EXPECT_FALSE(key_event2.stopped_propagation()); 1797 EXPECT_FALSE(key_event2.stopped_propagation());
1798 1798
1799 widget->CloseNow(); 1799 widget->CloseNow();
1800 } 1800 }
1801 1801
1802 } // namespace test 1802 } // namespace test
1803 } // namespace views 1803 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc ('k') | ui/wm/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698