Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Side by Side Diff: ui/aura_shell/shell.cc

Issue 8558031: [Aura] Refactor and update app list window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
11 #include "ui/aura/client/drag_drop_client.h" 11 #include "ui/aura/client/drag_drop_client.h"
12 #include "ui/aura/desktop.h" 12 #include "ui/aura/desktop.h"
13 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
14 #include "ui/aura/window_types.h" 14 #include "ui/aura/window_types.h"
15 #include "ui/aura_shell/app_list.h"
15 #include "ui/aura_shell/default_container_event_filter.h" 16 #include "ui/aura_shell/default_container_event_filter.h"
16 #include "ui/aura_shell/default_container_layout_manager.h" 17 #include "ui/aura_shell/default_container_layout_manager.h"
17 #include "ui/aura_shell/desktop_event_filter.h" 18 #include "ui/aura_shell/desktop_event_filter.h"
18 #include "ui/aura_shell/desktop_layout_manager.h" 19 #include "ui/aura_shell/desktop_layout_manager.h"
19 #include "ui/aura_shell/drag_drop_controller.h" 20 #include "ui/aura_shell/drag_drop_controller.h"
20 #include "ui/aura_shell/launcher/launcher.h" 21 #include "ui/aura_shell/launcher/launcher.h"
21 #include "ui/aura_shell/modal_container_layout_manager.h" 22 #include "ui/aura_shell/modal_container_layout_manager.h"
22 #include "ui/aura_shell/shelf_layout_controller.h" 23 #include "ui/aura_shell/shelf_layout_controller.h"
23 #include "ui/aura_shell/shell_delegate.h" 24 #include "ui/aura_shell/shell_delegate.h"
24 #include "ui/aura_shell/shell_factory.h" 25 #include "ui/aura_shell/shell_factory.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 void Shell::RemoveDesktopEventFilter(aura::EventFilter* filter) { 211 void Shell::RemoveDesktopEventFilter(aura::EventFilter* filter) {
211 static_cast<internal::DesktopEventFilter*>( 212 static_cast<internal::DesktopEventFilter*>(
212 aura::Desktop::GetInstance()->event_filter())->RemoveFilter(filter); 213 aura::Desktop::GetInstance()->event_filter())->RemoveFilter(filter);
213 } 214 }
214 215
215 void Shell::ToggleOverview() { 216 void Shell::ToggleOverview() {
216 if (workspace_controller_.get()) 217 if (workspace_controller_.get())
217 workspace_controller_->ToggleOverview(); 218 workspace_controller_->ToggleOverview();
218 } 219 }
219 220
221 void Shell::ToggleAppList() {
222 if (!app_list_.get())
223 app_list_.reset(new internal::AppList);
224 app_list_->SetVisible(!app_list_->IsVisible());
225 }
226
220 //////////////////////////////////////////////////////////////////////////////// 227 ////////////////////////////////////////////////////////////////////////////////
221 // Shell, private: 228 // Shell, private:
222 229
223 void Shell::EnableWorkspaceManager() { 230 void Shell::EnableWorkspaceManager() {
224 aura::Window* default_container = 231 aura::Window* default_container =
225 GetContainer(internal::kShellWindowId_DefaultContainer); 232 GetContainer(internal::kShellWindowId_DefaultContainer);
226 233
227 workspace_controller_.reset( 234 workspace_controller_.reset(
228 new internal::WorkspaceController(default_container)); 235 new internal::WorkspaceController(default_container));
229 workspace_controller_->SetLauncherModel(launcher_->model()); 236 workspace_controller_->SetLauncherModel(launcher_->model());
230 default_container->SetEventFilter( 237 default_container->SetEventFilter(
231 new internal::DefaultContainerEventFilter(default_container)); 238 new internal::DefaultContainerEventFilter(default_container));
232 default_container->SetLayoutManager( 239 default_container->SetLayoutManager(
233 new internal::DefaultContainerLayoutManager( 240 new internal::DefaultContainerLayoutManager(
234 workspace_controller_->workspace_manager())); 241 workspace_controller_->workspace_manager()));
235 } 242 }
236 243
237 } // namespace aura_shell 244 } // namespace aura_shell
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698