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

Unified Diff: ash/shelf/shelf_tooltip_manager_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/shelf/shelf_tooltip_manager.cc ('k') | ash/shelf/shelf_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_tooltip_manager_unittest.cc
diff --git a/ash/shelf/shelf_tooltip_manager_unittest.cc b/ash/shelf/shelf_tooltip_manager_unittest.cc
index 7ce38dfc1d8941ffbec28416ccf5d410036cf027..c9096c96ed43d4832acf8e584db569ca971dcfe8 100644
--- a/ash/shelf/shelf_tooltip_manager_unittest.cc
+++ b/ash/shelf/shelf_tooltip_manager_unittest.cc
@@ -42,9 +42,8 @@ class ShelfTooltipManagerTest : public AshTestBase {
virtual void SetUp() OVERRIDE {
AshTestBase::SetUp();
- internal::RootWindowController* controller =
- Shell::GetPrimaryRootWindowController();
- tooltip_manager_.reset(new internal::ShelfTooltipManager(
+ RootWindowController* controller = Shell::GetPrimaryRootWindowController();
+ tooltip_manager_.reset(new ShelfTooltipManager(
controller->GetShelfLayoutManager(),
ShelfTestAPI(controller->shelf()->shelf()).shelf_view()));
}
@@ -83,7 +82,7 @@ class ShelfTooltipManagerTest : public AshTestBase {
protected:
scoped_ptr<views::Widget> widget_;
scoped_ptr<views::View> dummy_anchor_;
- scoped_ptr<internal::ShelfTooltipManager> tooltip_manager_;
+ scoped_ptr<ShelfTooltipManager> tooltip_manager_;
private:
void CreateWidget() {
@@ -94,9 +93,8 @@ class ShelfTooltipManagerTest : public AshTestBase {
views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
- params.parent = Shell::GetContainer(
- Shell::GetPrimaryRootWindow(),
- ash::internal::kShellWindowId_ShelfContainer);
+ params.parent = Shell::GetContainer(Shell::GetPrimaryRootWindow(),
+ ash::kShellWindowId_ShelfContainer);
widget_->Init(params);
widget_->SetContentsView(dummy_anchor_.get());
@@ -157,7 +155,7 @@ TEST_F(ShelfTooltipManagerTest, HideWhenShelfIsAutoHide) {
ShowImmediately();
ASSERT_TRUE(TooltipIsVisible());
- internal::ShelfLayoutManager* shelf =
+ ShelfLayoutManager* shelf =
Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
shelf->UpdateAutoHideState();
« no previous file with comments | « ash/shelf/shelf_tooltip_manager.cc ('k') | ash/shelf/shelf_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698