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

Unified Diff: ash/shell.cc

Issue 26277006: Created ash::FirstRunHelper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 92a81d5fd6447f142ed113762149b7a5cbeaf6d4..0a11b523d29d3788f3443b236d6945106ae19a7d 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -23,6 +23,7 @@
#include "ash/display/resolution_notification_controller.h"
#include "ash/display/screen_position_controller.h"
#include "ash/drag_drop/drag_drop_controller.h"
+#include "ash/first_run/first_run_delegate_impl.h"
#include "ash/focus_cycler.h"
#include "ash/high_contrast/high_contrast_controller.h"
#include "ash/host/root_window_host_factory.h"
@@ -293,6 +294,10 @@ aura::Window* Shell::GetAppListWindow() {
return app_list_controller_.get() ? app_list_controller_->GetWindow() : NULL;
}
+app_list::AppListView* Shell::GetAppListView() {
+ return app_list_controller_.get() ? app_list_controller_->GetView() : NULL;
+}
+
bool Shell::IsSystemModalWindowOpen() const {
if (simulate_modal_window_open_for_testing_)
return true;
@@ -504,6 +509,12 @@ void Shell::SetTouchHudProjectionEnabled(bool enabled) {
OnTouchHudProjectionToggled(enabled));
}
+#if defined(OS_CHROMEOS)
+ash::FirstRunDelegate* Shell::CreateFirstRunDelegate() {
+ return new ash::FirstRunDelegateImpl;
+}
+#endif // defined(OS_CHROMEOS)
+
void Shell::InitRootWindowForSecondaryDisplay(aura::RootWindow* root) {
internal::RootWindowController* controller =
new internal::RootWindowController(root);

Powered by Google App Engine
This is Rietveld 408576698