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

Unified Diff: ui/aura_shell/toplevel_window_event_filter.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/toplevel_layout_manager_unittest.cc ('k') | ui/aura_shell/window_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/toplevel_window_event_filter.cc
===================================================================
--- ui/aura_shell/toplevel_window_event_filter.cc (revision 114849)
+++ ui/aura_shell/toplevel_window_event_filter.cc (working copy)
@@ -126,7 +126,7 @@
}
void ToggleMaximizedState(aura::Window* window) {
- window->SetIntProperty(aura::kShowStateKey,
+ window->SetIntProperty(aura::client::kShowStateKey,
IsWindowMaximized(window) ?
ui::SHOW_STATE_NORMAL : ui::SHOW_STATE_MAXIMIZED);
}
@@ -208,8 +208,10 @@
return false;
// Only a normal/default window can be moved/resized.
- if (target->GetIntProperty(aura::kShowStateKey) != ui::SHOW_STATE_NORMAL &&
- target->GetIntProperty(aura::kShowStateKey) != ui::SHOW_STATE_DEFAULT)
+ if (target->GetIntProperty(aura::client::kShowStateKey) !=
+ ui::SHOW_STATE_NORMAL &&
+ target->GetIntProperty(aura::client::kShowStateKey) !=
+ ui::SHOW_STATE_DEFAULT)
return false;
// Dragging a window moves the local coordinate frame, so do arithmetic
« no previous file with comments | « ui/aura_shell/toplevel_layout_manager_unittest.cc ('k') | ui/aura_shell/window_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698