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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura_shell/workspace_controller.cc

Issue 8968022: Shell related switches -> aura shell switches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 | « ui/aura_shell/workspace/workspace_manager_unittest.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/workspace_controller.cc
===================================================================
--- ui/aura_shell/workspace_controller.cc (revision 114849)
+++ ui/aura_shell/workspace_controller.cc (working copy)
@@ -4,6 +4,7 @@
#include "ui/aura_shell/workspace_controller.h"
+#include "ui/aura/client/activation_client.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
@@ -58,7 +59,7 @@
void WorkspaceController::OnWindowPropertyChanged(aura::Window* window,
const char* key,
void* old) {
- if (key == aura::kRootWindowActiveWindow) {
+ if (key == aura::client::kRootWindowActiveWindow) {
// FindBy handles NULL.
Workspace* workspace = workspace_manager_->FindBy(GetActiveWindow());
if (workspace)
« no previous file with comments | « ui/aura_shell/workspace/workspace_manager_unittest.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698