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

Unified Diff: media/gpu/rendering_helper.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 | « media/gpu/rendering_helper.h ('k') | services/ui/display/screen_manager_ozone.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/rendering_helper.cc
diff --git a/media/gpu/rendering_helper.cc b/media/gpu/rendering_helper.cc
index 9dc4940e2ea17bc0eb6cacc74fb3fd5fc86ba703..2ef0c3e6f250d88ab288acdf525b167a592cc59f 100644
--- a/media/gpu/rendering_helper.cc
+++ b/media/gpu/rendering_helper.cc
@@ -86,23 +86,24 @@ void WaitForSwapAck(const base::Closure& callback, gfx::SwapResult result) {
#if defined(USE_OZONE)
-class DisplayConfiguratorObserver : public ui::DisplayConfigurator::Observer {
+class DisplayConfiguratorObserver
+ : public display::DisplayConfigurator::Observer {
public:
explicit DisplayConfiguratorObserver(base::RunLoop* loop) : loop_(loop) {}
~DisplayConfiguratorObserver() override {}
private:
- // ui::DisplayConfigurator::Observer overrides:
+ // display::DisplayConfigurator::Observer overrides:
void OnDisplayModeChanged(
- const ui::DisplayConfigurator::DisplayStateList& outputs) override {
+ const display::DisplayConfigurator::DisplayStateList& outputs) override {
if (!loop_)
return;
loop_->Quit();
loop_ = nullptr;
}
void OnDisplayModeChangeFailed(
- const ui::DisplayConfigurator::DisplayStateList& outputs,
- ui::MultipleDisplayState failed_new_state) override {
+ const display::DisplayConfigurator::DisplayStateList& outputs,
+ display::MultipleDisplayState failed_new_state) override {
LOG(FATAL) << "Could not configure display";
}
@@ -257,7 +258,7 @@ void RenderingHelper::Setup() {
// the same size.
base::RunLoop wait_display_setup;
DisplayConfiguratorObserver display_setup_observer(&wait_display_setup);
- display_configurator_.reset(new ui::DisplayConfigurator());
+ display_configurator_.reset(new display::DisplayConfigurator());
display_configurator_->SetDelegateForTesting(0);
display_configurator_->AddObserver(&display_setup_observer);
display_configurator_->Init(
« no previous file with comments | « media/gpu/rendering_helper.h ('k') | services/ui/display/screen_manager_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698