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

Unified Diff: ash/shell/content/client/shell_browser_main_parts.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/shell.cc ('k') | ash/shell/toplevel_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/content/client/shell_browser_main_parts.cc
diff --git a/ash/shell/content/client/shell_browser_main_parts.cc b/ash/shell/content/client/shell_browser_main_parts.cc
index 2a9613b29268f9b4af7ba0f79ac171b1f88db7a5..73bde5516793b437b4bcc076c5acf145a2dffb30 100644
--- a/ash/shell/content/client/shell_browser_main_parts.cc
+++ b/ash/shell/content/client/shell_browser_main_parts.cc
@@ -134,8 +134,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(user::LOGGED_IN_USER);
window_watcher_.reset(new ash::shell::WindowWatcher);
- gfx::Screen* screen = Shell::GetInstance()->GetScreen();
- screen->AddObserver(window_watcher_.get());
+ gfx::Screen::GetScreen()->AddObserver(window_watcher_.get());
ash::shell::InitWindowTypeLauncher();
@@ -143,8 +142,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
}
void ShellBrowserMainParts::PostMainMessageLoopRun() {
- gfx::Screen* screen = Shell::GetInstance()->GetScreen();
- screen->RemoveObserver(window_watcher_.get());
+ gfx::Screen::GetScreen()->RemoveObserver(window_watcher_.get());
window_watcher_.reset();
delegate_ = nullptr;
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/toplevel_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698