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

Unified Diff: services/ui/display/screen_manager_ozone.h

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 | « media/gpu/rendering_helper.cc ('k') | services/ui/display/screen_manager_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/display/screen_manager_ozone.h
diff --git a/services/ui/display/screen_manager_ozone.h b/services/ui/display/screen_manager_ozone.h
index 30e11141f0f19278de92ee59b975a502c5e3f928..bc8642778011a07b0a18141f17957747ce1623f2 100644
--- a/services/ui/display/screen_manager_ozone.h
+++ b/services/ui/display/screen_manager_ozone.h
@@ -83,7 +83,7 @@ class ScreenManagerOzone
void CloseMirroringDisplayIfNotNecessary() override;
void PreDisplayConfigurationChange(bool clear_focus) override;
void PostDisplayConfigurationChange(bool must_clear_window) override;
- ui::DisplayConfigurator* display_configurator() override;
+ DisplayConfigurator* display_configurator() override;
// mojo::InterfaceFactory<mojom::DisplayController>:
void Create(const service_manager::Identity& remote_identity,
@@ -93,14 +93,14 @@ class ScreenManagerOzone
void Create(const service_manager::Identity& remote_identity,
mojom::TestDisplayControllerRequest request) override;
- ui::DisplayConfigurator display_configurator_;
+ DisplayConfigurator display_configurator_;
std::unique_ptr<DisplayManager> display_manager_;
std::unique_ptr<DisplayChangeObserver> display_change_observer_;
ScreenBase* screen_ = nullptr;
ScreenManagerDelegate* delegate_ = nullptr;
- std::unique_ptr<ui::NativeDisplayDelegate> native_display_delegate_;
+ std::unique_ptr<NativeDisplayDelegate> native_display_delegate_;
// If not null it provides a way to modify the display state when running off
// device (eg. running mustash on Linux).
« no previous file with comments | « media/gpu/rendering_helper.cc ('k') | services/ui/display/screen_manager_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698