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

Unified Diff: ash/utility/partial_screenshot_controller.cc

Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-5
Patch Set: cros Created 4 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/touch/touch_observer_hud_unittest.cc ('k') | ash/wm/ash_native_cursor_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/utility/partial_screenshot_controller.cc
diff --git a/ash/utility/partial_screenshot_controller.cc b/ash/utility/partial_screenshot_controller.cc
index f7ac242eb9bcb6c9e93391c53f7b4d3dad1ab881..bce345372d4d08403166b741fe65db152d7f9972 100644
--- a/ash/utility/partial_screenshot_controller.cc
+++ b/ash/utility/partial_screenshot_controller.cc
@@ -15,6 +15,7 @@
#include "ui/events/event.h"
#include "ui/events/event_handler.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/screen.h"
#include "ui/wm/core/cursor_manager.h"
namespace ash {
@@ -144,7 +145,7 @@ void PartialScreenshotController::StartPartialScreenshotSession(
}
screenshot_delegate_ = screenshot_delegate;
- Shell::GetScreen()->AddObserver(this);
+ gfx::Screen::GetScreen()->AddObserver(this);
for (aura::Window* root : Shell::GetAllRootWindows()) {
layers_[root] = new PartialScreenshotLayer(
Shell::GetContainer(root, kShellWindowId_OverlayContainer)->layer());
@@ -185,7 +186,7 @@ void PartialScreenshotController::Complete() {
void PartialScreenshotController::Cancel() {
root_window_ = nullptr;
screenshot_delegate_ = nullptr;
- Shell::GetScreen()->RemoveObserver(this);
+ gfx::Screen::GetScreen()->RemoveObserver(this);
STLDeleteValues(&layers_);
cursor_setter_.reset();
EnableMouseWarp(true);
« no previous file with comments | « ash/touch/touch_observer_hud_unittest.cc ('k') | ash/wm/ash_native_cursor_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698