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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/workspace_controller.cc

Issue 11293014: Renames Workspace*2 -> Workspace*. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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/wm/workspace_controller.h ('k') | ash/wm/workspace_controller_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller.cc
===================================================================
--- ash/wm/workspace_controller.cc (revision 165163)
+++ ash/wm/workspace_controller.cc (working copy)
@@ -6,7 +6,7 @@
#include "ash/ash_switches.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/workspace/workspace_manager2.h"
+#include "ash/wm/workspace/workspace_manager.h"
#include "base/command_line.h"
#include "ui/aura/client/activation_client.h"
#include "ui/aura/client/aura_constants.h"
@@ -19,7 +19,7 @@
WorkspaceController::WorkspaceController(aura::Window* viewport)
: viewport_(viewport) {
aura::RootWindow* root_window = viewport->GetRootWindow();
- workspace_manager_.reset(new WorkspaceManager2(viewport));
+ workspace_manager_.reset(new WorkspaceManager(viewport));
aura::client::GetActivationClient(root_window)->AddObserver(this);
}
« no previous file with comments | « ash/wm/workspace_controller.h ('k') | ash/wm/workspace_controller_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698