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

Unified Diff: ash/shelf/shelf.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.h ('k') | ash/shelf/shelf_alignment_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf.cc
diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc
index c973157a6ab54ccf087677a81abeb3e5ae616cc8..2d988fce39fef1bc1f8483d89c959005aac18519 100644
--- a/ash/shelf/shelf.cc
+++ b/ash/shelf/shelf.cc
@@ -49,7 +49,7 @@ Shelf::Shelf(ShelfModel* shelf_model,
alignment_(shelf_widget->GetAlignment()),
delegate_(shelf_delegate),
shelf_widget_(shelf_widget) {
- shelf_view_ = new internal::ShelfView(
+ shelf_view_ = new ShelfView(
shelf_model, delegate_, shelf_widget_->shelf_layout_manager());
shelf_view_->Init();
shelf_widget_->GetContentsView()->AddChildView(shelf_view_);
@@ -63,15 +63,14 @@ Shelf::~Shelf() {
// static
Shelf* Shelf::ForPrimaryDisplay() {
- ShelfWidget* shelf_widget = internal::RootWindowController::ForShelf(
- Shell::GetPrimaryRootWindow())->shelf();
+ ShelfWidget* shelf_widget =
+ RootWindowController::ForShelf(Shell::GetPrimaryRootWindow())->shelf();
return shelf_widget ? shelf_widget->shelf() : NULL;
}
// static
Shelf* Shelf::ForWindow(aura::Window* window) {
- ShelfWidget* shelf_widget =
- internal::RootWindowController::ForShelf(window)->shelf();
+ ShelfWidget* shelf_widget = RootWindowController::ForShelf(window)->shelf();
return shelf_widget ? shelf_widget->shelf() : NULL;
}
« no previous file with comments | « ash/shelf/shelf.h ('k') | ash/shelf/shelf_alignment_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698