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

Unified Diff: chrome/browser/chromeos/extensions/wallpaper_private_api.cc

Issue 2115663002: Folds methods in WmShellCommon to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 6 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/wm/window_cycle_list.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/wallpaper_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
index a0905ed8ba982031e353408e08b72111211476cd..534b44243a366e575c0b6ddbc03752918b7b9829 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -14,6 +14,7 @@
#include "ash/aura/wm_window_aura.h"
#include "ash/common/wm/mru_window_tracker.h"
#include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
#include "ash/desktop_background/desktop_background_controller.h"
#include "ash/shell.h"
#include "ash/wm/window_state_aura.h"
@@ -216,10 +217,8 @@ void WindowStateManager::BuildWindowListAndMinimizeInactiveForUser(
std::set<aura::Window*>* results =
&user_id_hash_window_list_map_[user_id_hash];
- std::vector<aura::Window*> windows =
- ash::WmWindowAura::ToAuraWindows(ash::Shell::GetInstance()
- ->mru_window_tracker()
- ->BuildWindowListIgnoreModal());
+ std::vector<aura::Window*> windows = ash::WmWindowAura::ToAuraWindows(
+ ash::WmShell::Get()->mru_window_tracker()->BuildWindowListIgnoreModal());
for (std::vector<aura::Window*>::iterator iter = windows.begin();
iter != windows.end(); ++iter) {
« no previous file with comments | « ash/wm/window_cycle_list.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698