| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/window_state.h" | 5 #include "ash/wm/window_state.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/screen_util.h" | 9 #include "ash/screen_util.h" |
| 10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 } | 243 } |
| 244 | 244 |
| 245 void WindowState::AddObserver(WindowStateObserver* observer) { | 245 void WindowState::AddObserver(WindowStateObserver* observer) { |
| 246 observer_list_.AddObserver(observer); | 246 observer_list_.AddObserver(observer); |
| 247 } | 247 } |
| 248 | 248 |
| 249 void WindowState::RemoveObserver(WindowStateObserver* observer) { | 249 void WindowState::RemoveObserver(WindowStateObserver* observer) { |
| 250 observer_list_.RemoveObserver(observer); | 250 observer_list_.RemoveObserver(observer); |
| 251 } | 251 } |
| 252 | 252 |
| 253 bool WindowState::CreateDragDetails(aura::Window* window, | 253 void WindowState::CreateDragDetails(aura::Window* window, |
| 254 const gfx::Point& point_in_parent, | 254 const gfx::Point& point_in_parent, |
| 255 int window_component, | 255 int window_component, |
| 256 aura::client::WindowMoveSource source) { | 256 aura::client::WindowMoveSource source) { |
| 257 scoped_ptr<DragDetails> details(new DragDetails( | 257 drag_details_.reset( |
| 258 window, point_in_parent, window_component, source)); | 258 new DragDetails(window, point_in_parent, window_component, source)); |
| 259 if (!details->is_resizable) | |
| 260 return false; | |
| 261 drag_details_ = details.Pass(); | |
| 262 return true; | |
| 263 } | 259 } |
| 264 | 260 |
| 265 void WindowState::DeleteDragDetails() { | 261 void WindowState::DeleteDragDetails() { |
| 266 drag_details_.reset(); | 262 drag_details_.reset(); |
| 267 } | 263 } |
| 268 | 264 |
| 269 void WindowState::OnWindowPropertyChanged(aura::Window* window, | 265 void WindowState::OnWindowPropertyChanged(aura::Window* window, |
| 270 const void* key, | 266 const void* key, |
| 271 intptr_t old) { | 267 intptr_t old) { |
| 272 DCHECK_EQ(window, window_); | 268 DCHECK_EQ(window, window_); |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 } | 333 } |
| 338 return settings; | 334 return settings; |
| 339 } | 335 } |
| 340 | 336 |
| 341 const WindowState* GetWindowState(const aura::Window* window) { | 337 const WindowState* GetWindowState(const aura::Window* window) { |
| 342 return GetWindowState(const_cast<aura::Window*>(window)); | 338 return GetWindowState(const_cast<aura::Window*>(window)); |
| 343 } | 339 } |
| 344 | 340 |
| 345 } // namespace wm | 341 } // namespace wm |
| 346 } // namespace ash | 342 } // namespace ash |
| OLD | NEW |