| Index: ash/wm/app_list_controller.cc
|
| diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc
|
| index b00319c3fef7a3f2330a1f740bd68f43d37b6391..cf5e04d020262fdc5412c23ab7632bba165b50eb 100644
|
| --- a/ash/wm/app_list_controller.cc
|
| +++ b/ash/wm/app_list_controller.cc
|
| @@ -27,8 +27,6 @@
|
| #include "ui/views/widget/widget.h"
|
|
|
| namespace ash {
|
| -namespace internal {
|
| -
|
| namespace {
|
|
|
| // Duration for show/hide animation in milliseconds.
|
| @@ -295,12 +293,12 @@ void AppListController::ProcessLocatedEvent(ui::LocatedEvent* event) {
|
| RootWindowController* root_controller =
|
| GetRootWindowController(target->GetRootWindow());
|
| if (root_controller) {
|
| - aura::Window* menu_container = root_controller->GetContainer(
|
| - internal::kShellWindowId_MenuContainer);
|
| + aura::Window* menu_container =
|
| + root_controller->GetContainer(kShellWindowId_MenuContainer);
|
| if (menu_container->Contains(target))
|
| return;
|
| aura::Window* keyboard_container = root_controller->GetContainer(
|
| - internal::kShellWindowId_VirtualKeyboardContainer);
|
| + kShellWindowId_VirtualKeyboardContainer);
|
| if (keyboard_container->Contains(target))
|
| return;
|
| }
|
| @@ -437,5 +435,4 @@ void AppListController::TransitionChanged() {
|
| }
|
| }
|
|
|
| -} // namespace internal
|
| } // namespace ash
|
|
|