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

Unified Diff: ash/root_window_controller.cc

Issue 11201002: Removes worskpace 1 code. Will rename next. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove constants and add back kDisableLoginAnimations Created 8 years, 2 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/root_window_controller.h ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index cabeb973f633b968ad71029048afd95c1e4e87ee..8640429b1f1f4e844de375f8c2eff692bc8cf86d 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -107,20 +107,17 @@ void ReparentAllWindows(aura::RootWindow* src, aura::RootWindow* dst) {
};
// For Workspace2 we need to manually reparent the windows. This way
// Workspace2 can move the windows to the appropriate workspace.
- if (internal::WorkspaceController::IsWorkspace2Enabled()) {
- std::vector<aura::Window*> windows(GetWorkspaceWindows(src));
- internal::WorkspaceController* workspace_controller =
- GetRootWindowController(dst)->workspace_controller();
- for (size_t i = 0; i < windows.size(); ++i) {
- aura::Window* new_parent =
- workspace_controller->GetParentForNewWindow(windows[i]);
- ReparentWindow(windows[i], new_parent);
- }
+ std::vector<aura::Window*> windows(GetWorkspaceWindows(src));
+ internal::WorkspaceController* workspace_controller =
+ GetRootWindowController(dst)->workspace_controller();
+ for (size_t i = 0; i < windows.size(); ++i) {
+ aura::Window* new_parent =
+ workspace_controller->GetParentForNewWindow(windows[i]);
+ ReparentWindow(windows[i], new_parent);
}
for (size_t i = 0; i < arraysize(kContainerIdsToMove); i++) {
int id = kContainerIdsToMove[i];
- if (id == internal::kShellWindowId_DefaultContainer &&
- internal::WorkspaceController::IsWorkspace2Enabled())
+ if (id == internal::kShellWindowId_DefaultContainer)
continue;
aura::Window* src_container = Shell::GetContainer(src, id);
@@ -353,10 +350,6 @@ void RootWindowController::CloseChildWindows() {
shelf_ = NULL;
}
-bool RootWindowController::IsInMaximizedMode() const {
- return workspace_controller_->IsInMaximizedMode();
-}
-
void RootWindowController::MoveWindowsTo(aura::RootWindow* dst) {
aura::Window* focused = dst->GetFocusManager()->GetFocusedWindow();
aura::WindowTracker tracker;
@@ -461,10 +454,6 @@ void RootWindowController::CreateContainersInRootWindow(
kShellWindowId_DefaultContainer,
"DefaultContainer",
non_lock_screen_containers);
- if (!WorkspaceController::IsWorkspace2Enabled()) {
- default_container_handler_.reset(
- new ToplevelWindowEventHandler(default_container));
- }
SetChildWindowVisibilityChangesAnimated(default_container);
SetUsesScreenCoordinates(default_container);
« no previous file with comments | « ash/root_window_controller.h ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698