| 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 "aura/desktop.h" | 5 #include "ui/aura/desktop.h" |
| 6 | 6 |
| 7 #include "aura/desktop_host.h" | |
| 8 #include "aura/root_window.h" | |
| 9 #include "aura/window.h" | |
| 10 #include "base/logging.h" | 7 #include "base/logging.h" |
| 11 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "ui/aura/desktop_host.h" |
| 10 #include "ui/aura/root_window.h" |
| 11 #include "ui/aura/window.h" |
| 12 #include "ui/gfx/compositor/compositor.h" | 12 #include "ui/gfx/compositor/compositor.h" |
| 13 #include "ui/gfx/compositor/layer.h" | 13 #include "ui/gfx/compositor/layer.h" |
| 14 | 14 |
| 15 namespace aura { | 15 namespace aura { |
| 16 | 16 |
| 17 // static | 17 // static |
| 18 Desktop* Desktop::instance_ = NULL; | 18 Desktop* Desktop::instance_ = NULL; |
| 19 | 19 |
| 20 Desktop::Desktop() | 20 Desktop::Desktop() |
| 21 : host_(aura::DesktopHost::Create(gfx::Rect(200, 200, 1024, 768))), | 21 : host_(aura::DesktopHost::Create(gfx::Rect(200, 200, 1024, 768))), |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 // static | 79 // static |
| 80 Desktop* Desktop::GetInstance() { | 80 Desktop* Desktop::GetInstance() { |
| 81 if (!instance_) { | 81 if (!instance_) { |
| 82 instance_ = new Desktop; | 82 instance_ = new Desktop; |
| 83 instance_->window_->Init(); | 83 instance_->window_->Init(); |
| 84 } | 84 } |
| 85 return instance_; | 85 return instance_; |
| 86 } | 86 } |
| 87 | 87 |
| 88 } // namespace aura | 88 } // namespace aura |
| OLD | NEW |
|---|
Chromium Code Reviews
