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

Unified Diff: ash/system/web_notification/web_notification_tray_unittest.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/system/web_notification/web_notification_tray.cc ('k') | ash/system/win/audio/tray_audio_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/web_notification/web_notification_tray_unittest.cc
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc
index 34fe4a50a7c9513d2f123e92b43a009a7184400e..5a87d14032c077ac04f175480980b103d6a98d04 100644
--- a/ash/system/web_notification/web_notification_tray_unittest.cc
+++ b/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -46,7 +46,7 @@ WebNotificationTray* GetTray() {
}
WebNotificationTray* GetSecondaryTray() {
- internal::RootWindowController* primary_controller =
+ RootWindowController* primary_controller =
Shell::GetPrimaryRootWindowController();
Shell::RootWindowControllerList controllers =
Shell::GetAllRootWindowControllers();
@@ -293,15 +293,14 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupShownOnBothDisplays) {
// root window controller and shelf with having notifications. This code
// verifies it doesn't cause crash and popups are still visible. See
// http://crbug.com/263664
- internal::DisplayManager* display_manager =
- Shell::GetInstance()->display_manager();
+ DisplayManager* display_manager = Shell::GetInstance()->display_manager();
- display_manager->SetSecondDisplayMode(internal::DisplayManager::MIRRORING);
+ display_manager->SetSecondDisplayMode(DisplayManager::MIRRORING);
UpdateDisplay("400x400,200x200");
EXPECT_TRUE(GetTray()->IsPopupVisible());
EXPECT_FALSE(GetSecondaryTray());
- display_manager->SetSecondDisplayMode(internal::DisplayManager::EXTENDED);
+ display_manager->SetSecondDisplayMode(DisplayManager::EXTENDED);
UpdateDisplay("400x400,200x200");
EXPECT_TRUE(GetTray()->IsPopupVisible());
secondary_tray = GetSecondaryTray();
@@ -370,7 +369,7 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupAndAutoHideShelf) {
// Shelf's auto-hide state won't be HIDDEN unless window exists.
scoped_ptr<aura::Window> window(
CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 3, 4)));
- internal::ShelfLayoutManager* shelf =
+ ShelfLayoutManager* shelf =
Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
@@ -432,7 +431,7 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupAndFullscreen) {
// Checks the work area for normal auto-hidden state.
scoped_ptr<aura::Window> window(
CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 3, 4)));
- internal::ShelfLayoutManager* shelf =
+ ShelfLayoutManager* shelf =
Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/system/win/audio/tray_audio_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698