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

Unified Diff: ash/shell.cc

Issue 10388032: Move app list from ash to ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: fix win_aura bot and comments in #5 Created 8 years, 7 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.h ('k') | ash/shell/app_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
===================================================================
--- ash/shell.cc (revision 135932)
+++ ash/shell.cc (working copy)
@@ -5,9 +5,9 @@
#include "ash/shell.h"
#include <algorithm>
+#include <string>
#include "ash/accelerators/focus_manager_factory.h"
-#include "ash/app_list/app_list.h"
#include "ash/ash_switches.h"
#include "ash/desktop_background/desktop_background_controller.h"
#include "ash/desktop_background/desktop_background_resources.h"
@@ -30,6 +30,7 @@
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/tooltips/tooltip_controller.h"
#include "ash/wm/activation_controller.h"
+#include "ash/wm/app_list_controller.h"
#include "ash/wm/base_layout_manager.h"
#include "ash/wm/custom_frame_view_ash.h"
#include "ash/wm/dialog_frame_view.h"
@@ -67,7 +68,6 @@
#include "ui/aura/env.h"
#include "ui/aura/layout_manager.h"
#include "ui/aura/monitor_manager.h"
-#include "ui/aura/monitor_manager.h"
#include "ui/aura/root_window.h"
#include "ui/aura/ui_controls_aura.h"
#include "ui/aura/window.h"
@@ -243,7 +243,7 @@
}
private:
- DISALLOW_COPY_AND_ASSIGN(DummyUserWallpaperDelegate);
+ DISALLOW_COPY_AND_ASSIGN(DummyUserWallpaperDelegate);
};
class DummySystemTrayDelegate : public SystemTrayDelegate {
@@ -260,7 +260,6 @@
virtual ~DummySystemTrayDelegate() {}
private:
-
virtual bool GetTrayVisibilityOnStartup() OVERRIDE { return true; }
// Overridden from SystemTrayDelegate:
@@ -780,17 +779,18 @@
}
void Shell::ToggleAppList() {
- if (!app_list_.get())
- app_list_.reset(new internal::AppList);
- app_list_->SetVisible(!app_list_->IsVisible());
+ if (!app_list_controller_.get())
+ app_list_controller_.reset(new internal::AppListController);
+ app_list_controller_->SetVisible(!app_list_controller_->IsVisible());
}
bool Shell::GetAppListTargetVisibility() const {
- return app_list_.get() && app_list_->GetTargetVisibility();
+ return app_list_controller_.get() &&
+ app_list_controller_->GetTargetVisibility();
}
aura::Window* Shell::GetAppListWindow() {
- return app_list_.get() ? app_list_->GetWindow() : NULL;
+ return app_list_controller_.get() ? app_list_controller_->GetWindow() : NULL;
}
bool Shell::IsScreenLocked() const {
« no previous file with comments | « ash/shell.h ('k') | ash/shell/app_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698