| Index: ash/shell.cc
|
| ===================================================================
|
| --- ash/shell.cc (revision 127786)
|
| +++ ash/shell.cc (working copy)
|
| @@ -37,6 +37,7 @@
|
| #include "ash/wm/base_layout_manager.h"
|
| #include "ash/wm/custom_frame_view_ash.h"
|
| #include "ash/wm/dialog_frame_view.h"
|
| +#include "ash/wm/event_client_impl.h"
|
| #include "ash/wm/panel_window_event_filter.h"
|
| #include "ash/wm/panel_layout_manager.h"
|
| #include "ash/wm/partial_screenshot_event_filter.h"
|
| @@ -185,7 +186,7 @@
|
| lock_screen_containers);
|
| lock_container->SetLayoutManager(
|
| new internal::BaseLayoutManager(root_window));
|
| - lock_container->set_stops_event_propagation(true);
|
| + // TODO(beng): stopsevents
|
|
|
| aura::Window* lock_modal_container = CreateContainer(
|
| internal::kShellWindowId_LockSystemModalContainer,
|
| @@ -457,6 +458,7 @@
|
| resize_shadow_controller_.reset();
|
| shadow_controller_.reset();
|
| window_cycle_controller_.reset();
|
| + event_client_.reset();
|
|
|
| // Launcher widget has a InputMethodBridge that references to
|
| // input_method_filter_'s input_method_. So explicitly release launcher_
|
| @@ -540,6 +542,8 @@
|
| root_window_layout_ = new internal::RootWindowLayoutManager(root_window);
|
| root_window->SetLayoutManager(root_window_layout_);
|
|
|
| + event_client_.reset(new internal::EventClientImpl(root_window));
|
| +
|
| if (delegate_.get())
|
| status_widget_ = delegate_->CreateStatusArea();
|
|
|
| @@ -665,9 +669,7 @@
|
| }
|
|
|
| bool Shell::IsScreenLocked() const {
|
| - const aura::Window* lock_screen_container = GetContainer(
|
| - internal::kShellWindowId_LockScreenContainer);
|
| - return lock_screen_container->StopsEventPropagation();
|
| + return !delegate_.get() || delegate_->IsScreenLocked();
|
| }
|
|
|
| bool Shell::IsModalWindowOpen() const {
|
|
|