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

Side by Side Diff: chrome/browser/ui/panels/panel_browsertest.cc

Issue 1560293002: Rename KEY_ constants to avoid conflict with <linux/input.h> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments (Wez) Created 4 years, 11 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) 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 1684 matching lines...) Expand 10 before | Expand all | Expand 10 after
1695 base::FilePath(FILE_PATH_LITERAL("update-preferred-size.html")))); 1695 base::FilePath(FILE_PATH_LITERAL("update-preferred-size.html"))));
1696 params.url = url; 1696 params.url = url;
1697 Panel* panel = CreatePanelWithParams(params); 1697 Panel* panel = CreatePanelWithParams(params);
1698 EXPECT_EQ(1, panel_manager->num_panels()); 1698 EXPECT_EQ(1, panel_manager->num_panels());
1699 1699
1700 // Close the panel by accelerator. 1700 // Close the panel by accelerator.
1701 content::WindowedNotificationObserver signal( 1701 content::WindowedNotificationObserver signal(
1702 chrome::NOTIFICATION_PANEL_CLOSED, 1702 chrome::NOTIFICATION_PANEL_CLOSED,
1703 content::Source<Panel>(panel)); 1703 content::Source<Panel>(panel));
1704 1704
1705 ui::KeyEvent ui_event(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::DomCode::KEY_W, 1705 ui::KeyEvent ui_event(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::DomCode::US_W,
1706 ui::EF_CONTROL_DOWN); 1706 ui::EF_CONTROL_DOWN);
1707 content::NativeWebKeyboardEvent key_event(ui_event); 1707 content::NativeWebKeyboardEvent key_event(ui_event);
1708 panel->HandleKeyboardEvent(key_event); 1708 panel->HandleKeyboardEvent(key_event);
1709 signal.Wait(); 1709 signal.Wait();
1710 EXPECT_EQ(0, panel_manager->num_panels()); 1710 EXPECT_EQ(0, panel_manager->num_panels());
1711 } 1711 }
1712 1712
1713 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, 1713 IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
1714 HideDockedPanelCreatedBeforeFullScreenMode) { 1714 HideDockedPanelCreatedBeforeFullScreenMode) {
1715 // Create a docked panel. 1715 // Create a docked panel.
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
1858 expected_prefix, 1858 expected_prefix,
1859 base::CompareCase::INSENSITIVE_ASCII)); 1859 base::CompareCase::INSENSITIVE_ASCII));
1860 1860
1861 PanelManager::GetInstance()->CloseAll(); 1861 PanelManager::GetInstance()->CloseAll();
1862 EXPECT_EQ(1U, task_manager.tasks().size()); 1862 EXPECT_EQ(1U, task_manager.tasks().size());
1863 } 1863 }
1864 1864
1865 } // namespace 1865 } // namespace
1866 1866
1867 #endif // defined(ENABLE_TASK_MANAGER) 1867 #endif // defined(ENABLE_TASK_MANAGER)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698