OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/shell/browser/shell_desktop_controller_aura.h" | 5 #include "extensions/shell/browser/shell_desktop_controller_aura.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 chromeos::DBusThreadManager::Get() | 252 chromeos::DBusThreadManager::Get() |
253 ->GetPowerManagerClient() | 253 ->GetPowerManagerClient() |
254 ->RequestShutdown(); | 254 ->RequestShutdown(); |
255 } | 255 } |
256 } | 256 } |
257 | 257 |
258 void ShellDesktopControllerAura::OnDisplayModeChanged( | 258 void ShellDesktopControllerAura::OnDisplayModeChanged( |
259 const ui::DisplayConfigurator::DisplayStateList& displays) { | 259 const ui::DisplayConfigurator::DisplayStateList& displays) { |
260 gfx::Size size = GetPrimaryDisplaySize(); | 260 gfx::Size size = GetPrimaryDisplaySize(); |
261 if (!size.IsEmpty()) | 261 if (!size.IsEmpty()) |
262 host_->UpdateRootWindowSize(size); | 262 host_->UpdateRootWindowSizeInPixels(size); |
263 } | 263 } |
264 #endif | 264 #endif |
265 | 265 |
266 void ShellDesktopControllerAura::OnHostCloseRequested( | 266 void ShellDesktopControllerAura::OnHostCloseRequested( |
267 const aura::WindowTreeHost* host) { | 267 const aura::WindowTreeHost* host) { |
268 DCHECK_EQ(host_.get(), host); | 268 DCHECK_EQ(host_.get(), host); |
269 CloseAppWindows(); | 269 CloseAppWindows(); |
270 base::ThreadTaskRunnerHandle::Get()->PostTask( | 270 base::ThreadTaskRunnerHandle::Get()->PostTask( |
271 FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); | 271 FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); |
272 } | 272 } |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 if (displays.empty()) | 359 if (displays.empty()) |
360 return gfx::Size(); | 360 return gfx::Size(); |
361 const ui::DisplayMode* mode = displays[0]->current_mode(); | 361 const ui::DisplayMode* mode = displays[0]->current_mode(); |
362 return mode ? mode->size() : gfx::Size(); | 362 return mode ? mode->size() : gfx::Size(); |
363 #else | 363 #else |
364 return gfx::Size(); | 364 return gfx::Size(); |
365 #endif | 365 #endif |
366 } | 366 } |
367 | 367 |
368 } // namespace extensions | 368 } // namespace extensions |
OLD | NEW |