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

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 2839643002: Have OobeUI handle display observation (Closed)
Patch Set: And also remove the other leftover header Created 3 years, 8 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
Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index 6db2b1af8b0e70bb4d47adbe482ba8dd6dcb53d3..12422f23939f1b1cbcbca21d8d476f5026910618 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -97,8 +97,6 @@
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_animation_observer.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
#include "ui/events/event_handler.h"
#include "ui/events/event_utils.h"
#include "ui/gfx/geometry/rect.h"
@@ -372,7 +370,6 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& wallpaper_bounds)
DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
CrasAudioHandler::Get()->AddAudioObserver(this);
- display::Screen::GetScreen()->AddObserver(this);
// We need to listen to CLOSE_ALL_BROWSERS_REQUEST but not APP_TERMINATING
// because/ APP_TERMINATING will never be fired as long as this keeps
@@ -482,7 +479,6 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& wallpaper_bounds)
LoginDisplayHostImpl::~LoginDisplayHostImpl() {
DBusThreadManager::Get()->GetSessionManagerClient()->RemoveObserver(this);
CrasAudioHandler::Get()->RemoveAudioObserver(this);
- display::Screen::GetScreen()->RemoveObserver(this);
if (login_view_ && login_window_)
login_window_->RemoveRemovalsObserver(this);
@@ -972,32 +968,6 @@ void LoginDisplayHostImpl::OnActiveOutputNodeChanged() {
}
////////////////////////////////////////////////////////////////////////////////
-// LoginDisplayHostImpl, display::DisplayObserver:
-
-void LoginDisplayHostImpl::OnDisplayAdded(const display::Display& new_display) {
-}
-
-void LoginDisplayHostImpl::OnDisplayRemoved(
- const display::Display& old_display) {}
-
-void LoginDisplayHostImpl::OnDisplayMetricsChanged(
- const display::Display& display,
- uint32_t changed_metrics) {
- display::Display primary_display =
- display::Screen::GetScreen()->GetPrimaryDisplay();
- if (display.id() != primary_display.id() ||
- !(changed_metrics & DISPLAY_METRIC_BOUNDS)) {
- return;
- }
-
- if (GetOobeUI()) {
- const gfx::Size& size = primary_display.size();
- GetOobeUI()->GetCoreOobeView()->SetClientAreaSize(size.width(),
- size.height());
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
// LoginDisplayHostImpl, views::WidgetRemovalsObserver:
void LoginDisplayHostImpl::OnWillRemoveView(views::Widget* widget,
views::View* view) {
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.h ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698