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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 23726015: All together now (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@screencast_cap
Patch Set: Created 7 years, 4 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/display/display_controller.cc ('k') | content/browser/aura/browser_compositor_output_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 96a89217a37c0c17c8b885936a37987488329940..fa8164ddbd59ec8ed52f07ac23a0a70e89df5547 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -84,6 +84,7 @@
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/base/ui_base_switches.h"
+#include "ui/compositor/compositor_retriever_delegate.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_animator.h"
#include "ui/gfx/display.h"
@@ -225,6 +226,7 @@ Shell::Shell(ShellDelegate* delegate)
if (!gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE))
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_);
display_controller_.reset(new DisplayController);
+ ui::CompositorRetrieverDelegate::SetDelegate(display_controller_.get());
#if defined(OS_CHROMEOS) && defined(USE_X11)
bool is_panel_fitting_disabled =
content::GpuDataManager::GetInstance()->IsFeatureBlacklisted(
« no previous file with comments | « ash/display/display_controller.cc ('k') | content/browser/aura/browser_compositor_output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698