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

Unified Diff: ash/shell.cc

Issue 11360045: ash: Add RootWindowHostFactory class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years 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 ba58f5dbf4cface476077125d719b02221ac9b2d..9e7b67ac066f433a55d5490278d728dc5c7646c9 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -23,6 +23,7 @@
#include "ash/magnifier/magnification_controller.h"
#include "ash/magnifier/partial_magnification_controller.h"
#include "ash/root_window_controller.h"
+#include "ash/root_window_delegate.h"
#include "ash/screen_ash.h"
#include "ash/shell_delegate.h"
#include "ash/shell_factory.h"
@@ -200,7 +201,7 @@ Shell::Shell(ShellDelegate* delegate)
browser_context_(NULL),
simulate_modal_window_open_for_testing_(false) {
DCHECK(delegate_.get());
- display_manager_.reset(new internal::DisplayManager);
+ display_manager_.reset(new internal::DisplayManager(this));
ANNOTATE_LEAKING_OBJECT_PTR(screen_); // see crbug.com/156466
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_ALTERNATE, screen_);
if (!gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE))
@@ -880,4 +881,11 @@ void Shell::OnEvent(ui::Event* event) {
}
}
+////////////////////////////////////////////////////////////////////////////////
+// Shell, ash::internal::DisplayManagerDelegate overrides:
+
+aura::RootWindowDelegate* Shell::CreateRootWindowDelegate() {
+ return delegate_->CreateRootWindowDelegate();
+}
+
} // namespace ash
« no previous file with comments | « ash/shell.h ('k') | ash/shell/shell_delegate_impl.h » ('j') | ui/aura/root_window.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698