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

Unified Diff: ash/shell.cc

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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/touch/touch_observer_hud.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 c302cc2175cac55f0d658fc5eaecc40fad017943..b9eb01774078d91fb3ec238ce4efd22927f5fd14 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -389,7 +389,7 @@ Shell::Shell(ShellDelegate* delegate)
link_handler_model_factory_(nullptr),
activation_client_(nullptr),
#if defined(OS_CHROMEOS)
- display_configurator_(new ui::DisplayConfigurator()),
+ display_configurator_(new display::DisplayConfigurator()),
#endif // defined(OS_CHROMEOS)
native_cursor_manager_(nullptr),
simulate_modal_window_open_for_testing_(false),
@@ -604,8 +604,9 @@ void Shell::Init(const ShellInitParams& init_params) {
ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate(),
!gpu_support_->IsPanelFittingDisabled());
#elif defined(USE_X11)
- display_configurator_->Init(base::MakeUnique<ui::NativeDisplayDelegateX11>(),
- !gpu_support_->IsPanelFittingDisabled());
+ display_configurator_->Init(
+ base::MakeUnique<display::NativeDisplayDelegateX11>(),
+ !gpu_support_->IsPanelFittingDisabled());
#endif
// The DBusThreadManager must outlive this Shell. See the DCHECK in ~Shell.
« no previous file with comments | « ash/shell.h ('k') | ash/touch/touch_observer_hud.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698