Index: ash/wm/workspace/workspace_window_resizer.cc |
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc |
index 6223de3e452cc396f23739af747f292595fe26fa..75fedaa35a9b9623fd849e3d2f1fa867d9fdd484 100644 |
--- a/ash/wm/workspace/workspace_window_resizer.cc |
+++ b/ash/wm/workspace/workspace_window_resizer.cc |
@@ -84,33 +84,27 @@ scoped_ptr<WindowResizer> CreateWindowResizer( |
window_state->CreateDragDetails(window, point_in_parent, window_component, |
source); |
if (window->parent() && |
- (window->parent()->id() == internal::kShellWindowId_DefaultContainer || |
- window->parent()->id() == internal::kShellWindowId_DockedContainer || |
- window->parent()->id() == internal::kShellWindowId_PanelContainer)) { |
- window_resizer = internal::WorkspaceWindowResizer::Create( |
- window_state, |
- std::vector<aura::Window*>()); |
+ (window->parent()->id() == kShellWindowId_DefaultContainer || |
+ window->parent()->id() == kShellWindowId_DockedContainer || |
+ window->parent()->id() == kShellWindowId_PanelContainer)) { |
+ window_resizer = WorkspaceWindowResizer::Create( |
+ window_state, std::vector<aura::Window*>()); |
} else { |
window_resizer = DefaultWindowResizer::Create(window_state); |
} |
- window_resizer = internal::DragWindowResizer::Create(window_resizer, |
- window_state); |
+ window_resizer = DragWindowResizer::Create(window_resizer, window_state); |
if (window->type() == ui::wm::WINDOW_TYPE_PANEL) |
window_resizer = PanelWindowResizer::Create(window_resizer, window_state); |
- if (switches::UseDockedWindows() && |
- window_resizer && window->parent() && |
+ if (switches::UseDockedWindows() && window_resizer && window->parent() && |
!::wm::GetTransientParent(window) && |
- (window->parent()->id() == internal::kShellWindowId_DefaultContainer || |
- window->parent()->id() == internal::kShellWindowId_DockedContainer || |
- window->parent()->id() == internal::kShellWindowId_PanelContainer)) { |
- window_resizer = internal::DockedWindowResizer::Create(window_resizer, |
- window_state); |
+ (window->parent()->id() == kShellWindowId_DefaultContainer || |
+ window->parent()->id() == kShellWindowId_DockedContainer || |
+ window->parent()->id() == kShellWindowId_PanelContainer)) { |
+ window_resizer = DockedWindowResizer::Create(window_resizer, window_state); |
} |
return make_scoped_ptr<WindowResizer>(window_resizer); |
} |
-namespace internal { |
- |
namespace { |
// Snapping distance used instead of WorkspaceWindowResizer::kScreenEdgeInset |
@@ -1047,5 +1041,4 @@ bool WorkspaceWindowResizer::AreBoundsValidSnappedBounds( |
return bounds_in_parent == snapped_bounds; |
} |
-} // namespace internal |
} // namespace ash |