| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "views/desktop/desktop_window_view.h" | 5 #include "views/desktop/desktop_window_view.h" |
| 6 | 6 |
| 7 #include "ui/gfx/canvas.h" | 7 #include "ui/gfx/canvas.h" |
| 8 #include "ui/gfx/transform.h" | 8 #include "ui/gfx/transform.h" |
| 9 #include "views/desktop/desktop_background.h" | 9 #include "views/desktop/desktop_background.h" |
| 10 #include "views/desktop/desktop_window_manager.h" | 10 #include "views/desktop/desktop_window_manager.h" |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 initial_bounds); | 159 initial_bounds); |
| 160 window->Show(); | 160 window->Show(); |
| 161 | 161 |
| 162 if (rotate) { | 162 if (rotate) { |
| 163 ui::Transform transform; | 163 ui::Transform transform; |
| 164 transform.SetRotate(90.0f); | 164 transform.SetRotate(90.0f); |
| 165 transform.SetTranslateX(window->GetWindowScreenBounds().width()); | 165 transform.SetTranslateX(window->GetWindowScreenBounds().width()); |
| 166 static_cast<NativeWidgetViews*>(window->native_widget())->GetView()-> | 166 static_cast<NativeWidgetViews*>(window->native_widget())->GetView()-> |
| 167 SetTransform(transform); | 167 SetTransform(transform); |
| 168 } | 168 } |
| 169 static_cast<NativeWidgetViews*>(window->native_widget())->GetView()-> | |
| 170 SetLayerPropertySetter(LayerPropertySetter::CreateAnimatingSetter()); | |
| 171 } | 169 } |
| 172 | 170 |
| 173 void DesktopWindowView::AddObserver(DesktopWindowView::Observer* observer) { | 171 void DesktopWindowView::AddObserver(DesktopWindowView::Observer* observer) { |
| 174 observers_.AddObserver(observer); | 172 observers_.AddObserver(observer); |
| 175 } | 173 } |
| 176 | 174 |
| 177 void DesktopWindowView::RemoveObserver(DesktopWindowView::Observer* observer) { | 175 void DesktopWindowView::RemoveObserver(DesktopWindowView::Observer* observer) { |
| 178 observers_.RemoveObserver(observer); | 176 observers_.RemoveObserver(observer); |
| 179 } | 177 } |
| 180 | 178 |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 return NULL; | 254 return NULL; |
| 257 | 255 |
| 258 case DESKTOP_OTHER: | 256 case DESKTOP_OTHER: |
| 259 return new NativeFrameView(widget_); | 257 return new NativeFrameView(widget_); |
| 260 } | 258 } |
| 261 return NULL; | 259 return NULL; |
| 262 } | 260 } |
| 263 | 261 |
| 264 } // namespace desktop | 262 } // namespace desktop |
| 265 } // namespace views | 263 } // namespace views |
| OLD | NEW |