| 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 "ash/host/ash_window_tree_host.h" | 5 #include "ash/host/ash_window_tree_host.h" |
| 6 | 6 |
| 7 #include "ash/ash_export.h" | 7 #include "ash/ash_export.h" |
| 8 #include "ash/ash_switches.h" | 8 #include "ash/ash_switches.h" |
| 9 #include "ash/host/ash_remote_window_tree_host_win.h" | 9 #include "ash/host/ash_remote_window_tree_host_win.h" |
| 10 #include "ash/host/root_window_transformer.h" | 10 #include "ash/host/root_window_transformer.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 target_rect.width(), | 64 target_rect.width(), |
| 65 target_rect.height(), | 65 target_rect.height(), |
| 66 SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); | 66 SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); |
| 67 } | 67 } |
| 68 virtual bool ConfineCursorToRootWindow() OVERRIDE { return false; } | 68 virtual bool ConfineCursorToRootWindow() OVERRIDE { return false; } |
| 69 virtual void UnConfineCursor() OVERRIDE { NOTIMPLEMENTED(); } | 69 virtual void UnConfineCursor() OVERRIDE { NOTIMPLEMENTED(); } |
| 70 virtual void SetRootWindowTransformer( | 70 virtual void SetRootWindowTransformer( |
| 71 scoped_ptr<RootWindowTransformer> transformer) { | 71 scoped_ptr<RootWindowTransformer> transformer) { |
| 72 transformer_helper_.SetRootWindowTransformer(transformer.Pass()); | 72 transformer_helper_.SetRootWindowTransformer(transformer.Pass()); |
| 73 } | 73 } |
| 74 virtual gfx::Insets GetHostInsets() const OVERRIDE { |
| 75 return transformer_helper_.GetHostInsets(); |
| 76 } |
| 74 virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE { return this; } | 77 virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE { return this; } |
| 75 | 78 |
| 76 // WindowTreeHostWin: | 79 // WindowTreeHostWin: |
| 77 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE { | 80 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE { |
| 78 if (fullscreen_) { | 81 if (fullscreen_) { |
| 79 saved_window_rect_.right = saved_window_rect_.left + bounds.width(); | 82 saved_window_rect_.right = saved_window_rect_.left + bounds.width(); |
| 80 saved_window_rect_.bottom = saved_window_rect_.top + bounds.height(); | 83 saved_window_rect_.bottom = saved_window_rect_.top + bounds.height(); |
| 81 return; | 84 return; |
| 82 } | 85 } |
| 83 WindowTreeHostWin::SetBounds(bounds); | 86 WindowTreeHostWin::SetBounds(bounds); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 110 AshWindowTreeHost* AshWindowTreeHost::Create(const gfx::Rect& initial_bounds) { | 113 AshWindowTreeHost* AshWindowTreeHost::Create(const gfx::Rect& initial_bounds) { |
| 111 if (base::win::GetVersion() >= base::win::VERSION_WIN7 && | 114 if (base::win::GetVersion() >= base::win::VERSION_WIN7 && |
| 112 !CommandLine::ForCurrentProcess()->HasSwitch( | 115 !CommandLine::ForCurrentProcess()->HasSwitch( |
| 113 ash::switches::kForceAshToDesktop)) | 116 ash::switches::kForceAshToDesktop)) |
| 114 return AshRemoteWindowTreeHostWin::GetInstance(); | 117 return AshRemoteWindowTreeHostWin::GetInstance(); |
| 115 | 118 |
| 116 return new AshWindowTreeHostWin(initial_bounds); | 119 return new AshWindowTreeHostWin(initial_bounds); |
| 117 } | 120 } |
| 118 | 121 |
| 119 } // namespace ash | 122 } // namespace ash |
| OLD | NEW |