| 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 "ui/aura/desktop.h" | 5 #include "ui/aura/desktop.h" |
| 6 #include "ui/aura/toplevel_window_container.h" | 6 #include "ui/aura/toplevel_window_container.h" |
| 7 #include "ui/aura/window.h" | 7 #include "ui/aura/window.h" |
| 8 #include "ui/aura_shell/desktop_layout_manager.h" | 8 #include "ui/aura_shell/desktop_layout_manager.h" |
| 9 #include "ui/aura_shell/shell_factory.h" | 9 #include "ui/aura_shell/shell_factory.h" |
| 10 #include "ui/aura_shell/shell_window_ids.h" | 10 #include "ui/aura_shell/shell_window_ids.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 new aura::internal::ToplevelWindowContainer; | 30 new aura::internal::ToplevelWindowContainer; |
| 31 always_on_top_container->set_id( | 31 always_on_top_container->set_id( |
| 32 internal::kShellWindowId_AlwaysOnTopContainer); | 32 internal::kShellWindowId_AlwaysOnTopContainer); |
| 33 containers->push_back(always_on_top_container); | 33 containers->push_back(always_on_top_container); |
| 34 | 34 |
| 35 aura::Window* launcher_container = new aura::Window(NULL); | 35 aura::Window* launcher_container = new aura::Window(NULL); |
| 36 launcher_container->set_id(internal::kShellWindowId_LauncherContainer); | 36 launcher_container->set_id(internal::kShellWindowId_LauncherContainer); |
| 37 containers->push_back(launcher_container); | 37 containers->push_back(launcher_container); |
| 38 | 38 |
| 39 aura::Window* lock_container = new aura::Window(NULL); | 39 aura::Window* lock_container = new aura::Window(NULL); |
| 40 lock_container->set_consumes_events(true); |
| 40 lock_container->set_id(internal::kShellWindowId_LockScreenContainer); | 41 lock_container->set_id(internal::kShellWindowId_LockScreenContainer); |
| 41 containers->push_back(lock_container); | 42 containers->push_back(lock_container); |
| 42 | 43 |
| 43 aura::Window* status_container = new aura::Window(NULL); | 44 aura::Window* status_container = new aura::Window(NULL); |
| 44 status_container->set_id(internal::kShellWindowId_StatusContainer); | 45 status_container->set_id(internal::kShellWindowId_StatusContainer); |
| 45 containers->push_back(status_container); | 46 containers->push_back(status_container); |
| 46 } | 47 } |
| 47 | 48 |
| 48 void InitDesktopWindow() { | 49 void InitDesktopWindow() { |
| 49 aura::Window::Windows containers; | 50 aura::Window::Windows containers; |
| (...skipping 25 matching lines...) Expand all Loading... |
| 75 internal::kShellWindowId_StatusContainer)->AddChild( | 76 internal::kShellWindowId_StatusContainer)->AddChild( |
| 76 status_area->GetNativeView()); | 77 status_area->GetNativeView()); |
| 77 | 78 |
| 78 desktop_layout->set_background_widget(desktop_background); | 79 desktop_layout->set_background_widget(desktop_background); |
| 79 desktop_layout->set_launcher_widget(launcher); | 80 desktop_layout->set_launcher_widget(launcher); |
| 80 desktop_layout->set_status_area_widget(status_area); | 81 desktop_layout->set_status_area_widget(status_area); |
| 81 } | 82 } |
| 82 | 83 |
| 83 } // namespace aura_shell | 84 } // namespace aura_shell |
| 84 | 85 |
| OLD | NEW |