| 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_shell/shell.h" |    5 #include "ui/aura_shell/shell.h" | 
|    6  |    6  | 
|    7 #include "base/bind.h" |    7 #include "base/bind.h" | 
|    8 #include "base/command_line.h" |    8 #include "base/command_line.h" | 
|    9 #include "ui/aura/aura_switches.h" |    9 #include "ui/aura/aura_switches.h" | 
|   10 #include "ui/aura/client/aura_constants.h" |   10 #include "ui/aura/client/aura_constants.h" | 
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   76   modal_container->set_id(internal::kShellWindowId_ModalContainer); |   76   modal_container->set_id(internal::kShellWindowId_ModalContainer); | 
|   77   containers->push_back(modal_container); |   77   containers->push_back(modal_container); | 
|   78  |   78  | 
|   79   // TODO(beng): Figure out if we can make this use ModalityEventFilter instead |   79   // TODO(beng): Figure out if we can make this use ModalityEventFilter instead | 
|   80   //             of stops_event_propagation. |   80   //             of stops_event_propagation. | 
|   81   aura::Window* lock_container = new aura::Window(NULL); |   81   aura::Window* lock_container = new aura::Window(NULL); | 
|   82   lock_container->set_stops_event_propagation(true); |   82   lock_container->set_stops_event_propagation(true); | 
|   83   lock_container->set_id(internal::kShellWindowId_LockScreenContainer); |   83   lock_container->set_id(internal::kShellWindowId_LockScreenContainer); | 
|   84   containers->push_back(lock_container); |   84   containers->push_back(lock_container); | 
|   85  |   85  | 
 |   86   aura::Window* lock_modal_container = new aura::Window(NULL); | 
 |   87   lock_modal_container->SetEventFilter( | 
 |   88       new ToplevelWindowEventFilter(lock_modal_container)); | 
 |   89   lock_modal_container->SetLayoutManager( | 
 |   90       new internal::ModalContainerLayoutManager(lock_modal_container)); | 
 |   91   lock_modal_container->set_id(internal::kShellWindowId_LockModalContainer); | 
 |   92   containers->push_back(lock_modal_container); | 
 |   93  | 
|   86   aura::Window* status_container = new aura::Window(NULL); |   94   aura::Window* status_container = new aura::Window(NULL); | 
|   87   status_container->set_id(internal::kShellWindowId_StatusContainer); |   95   status_container->set_id(internal::kShellWindowId_StatusContainer); | 
|   88   containers->push_back(status_container); |   96   containers->push_back(status_container); | 
|   89  |   97  | 
|   90   aura::Window* menu_container = new aura::Window(NULL); |   98   aura::Window* menu_container = new aura::Window(NULL); | 
|   91   menu_container->set_id(internal::kShellWindowId_MenusAndTooltipsContainer); |   99   menu_container->set_id(internal::kShellWindowId_MenusAndTooltipsContainer); | 
|   92   containers->push_back(menu_container); |  100   containers->push_back(menu_container); | 
|   93 } |  101 } | 
|   94  |  102  | 
|   95 }  // namespace |  103 }  // namespace | 
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  247       new internal::WorkspaceController(default_container)); |  255       new internal::WorkspaceController(default_container)); | 
|  248   workspace_controller_->SetLauncherModel(launcher_->model()); |  256   workspace_controller_->SetLauncherModel(launcher_->model()); | 
|  249   default_container->SetEventFilter( |  257   default_container->SetEventFilter( | 
|  250       new internal::DefaultContainerEventFilter(default_container)); |  258       new internal::DefaultContainerEventFilter(default_container)); | 
|  251   default_container->SetLayoutManager( |  259   default_container->SetLayoutManager( | 
|  252       new internal::DefaultContainerLayoutManager( |  260       new internal::DefaultContainerLayoutManager( | 
|  253           workspace_controller_->workspace_manager())); |  261           workspace_controller_->workspace_manager())); | 
|  254 } |  262 } | 
|  255  |  263  | 
|  256 }  // namespace aura_shell |  264 }  // namespace aura_shell | 
| OLD | NEW |