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

Unified Diff: ui/aura/root_window.cc

Issue 9696008: TestScreen shouldn't be marked aura export (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again. Created 8 years, 9 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 | « ui/aura/root_window.h ('k') | ui/aura/root_window_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.cc
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 3e84db1774f7f6021178095c5bb4d12183c3e68e..f4db009336def0681424579ee04e54bf150e7f08 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -22,7 +22,6 @@
#include "ui/aura/event_filter.h"
#include "ui/aura/focus_manager.h"
#include "ui/aura/gestures/gesture_recognizer.h"
-#include "ui/aura/screen_aura.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
#include "ui/base/hit_test.h"
@@ -91,7 +90,6 @@ RootWindow::RootWindow()
mouse_button_flags_(0),
last_cursor_(kCursorNull),
cursor_shown_(true),
- ALLOW_THIS_IN_INITIALIZER_LIST(screen_(new ScreenAura(this))),
capture_window_(NULL),
mouse_pressed_handler_(NULL),
mouse_moved_handler_(NULL),
@@ -108,7 +106,6 @@ RootWindow::RootWindow()
should_hold_mouse_moves_(false),
release_mouse_moves_after_draw_(false) {
SetName("RootWindow");
- gfx::Screen::SetInstance(screen_);
last_mouse_location_ = host_->QueryMouseLocation();
should_hold_mouse_moves_ = !CommandLine::ForCurrentProcess()->HasSwitch(
@@ -155,14 +152,6 @@ gfx::Size RootWindow::GetHostSize() const {
return rect.size();
}
-void RootWindow::SetScreenWorkAreaInsets(const gfx::Insets& insets) {
- if (screen_->work_area_insets() == insets)
- return;
- screen_->set_work_area_insets(insets);
- FOR_EACH_OBSERVER(RootWindowObserver, observers_,
- OnScreenWorkAreaInsetsChanged());
-}
-
void RootWindow::SetCursor(gfx::NativeCursor cursor) {
last_cursor_ = cursor;
// A lot of code seems to depend on NULL cursors actually showing an arrow,
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/root_window_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698