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

Unified Diff: ash/wm/ash_native_cursor_manager_interactive_uitest.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/ash_focus_rules.cc ('k') | ash/wm/boot_splash_screen_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/ash_native_cursor_manager_interactive_uitest.cc
diff --git a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
index 771b725e9a568b7ad735b121eff35d8d60900f9d..48d2af589c5bd5bd3e70d7a6d9b276799a82a870 100644
--- a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
+++ b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
@@ -50,10 +50,10 @@ class AshNativeCursorManagerTest : public test::AshTestBase {
namespace {
-internal::DisplayInfo CreateDisplayInfo(int64 id,
- const gfx::Rect& bounds,
- float device_scale_factor) {
- internal::DisplayInfo info(id, "", false);
+DisplayInfo CreateDisplayInfo(int64 id,
+ const gfx::Rect& bounds,
+ float device_scale_factor) {
+ DisplayInfo info(id, "", false);
info.SetBounds(bounds);
info.set_device_scale_factor(device_scale_factor);
return info;
@@ -93,13 +93,12 @@ TEST_F(AshNativeCursorManagerTest, MAYBE_CursorChangeOnEnterNotify) {
CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
test::CursorManagerTestApi test_api(cursor_manager);
- internal::DisplayManager* display_manager =
- Shell::GetInstance()->display_manager();
- internal::DisplayInfo display_info1 =
+ DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+ DisplayInfo display_info1 =
CreateDisplayInfo(10, gfx::Rect(0, 0, 500, 300), 1.0f);
- internal::DisplayInfo display_info2 =
+ DisplayInfo display_info2 =
CreateDisplayInfo(20, gfx::Rect(500, 0, 500, 300), 2.0f);
- std::vector<internal::DisplayInfo> display_info_list;
+ std::vector<DisplayInfo> display_info_list;
display_info_list.push_back(display_info1);
display_info_list.push_back(display_info2);
display_manager->OnNativeDisplaysChanged(display_info_list);
« no previous file with comments | « ash/wm/ash_focus_rules.cc ('k') | ash/wm/boot_splash_screen_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698