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

Unified Diff: ash/system/tray/system_tray_bubble.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback 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: ash/system/tray/system_tray_bubble.cc
diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc
index 7a2cc091598b3ad267ed5860911314bddb130b35..73a2d124716410ca69d04ab50a17378b50766553 100644
--- a/ash/system/tray/system_tray_bubble.cc
+++ b/ash/system/tray/system_tray_bubble.cc
@@ -8,12 +8,12 @@
#include <vector>
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/system_tray_item.h"
#include "ash/system/tray/tray_bubble_wrapper.h"
#include "ash/system/tray/tray_constants.h"
-#include "ash/wm_shell.h"
#include "base/metrics/histogram_macros.h"
#include "base/threading/thread_task_runner_handle.h"
#include "ui/compositor/layer.h"
@@ -305,7 +305,7 @@ void SystemTrayBubble::CreateItemViews(LoginStatus login_status) {
// If a system modal dialog is present, create the same tray as
// in locked state.
- if (WmShell::Get()->IsSystemModalWindowOpen() &&
+ if (ShellPort::Get()->IsSystemModalWindowOpen() &&
login_status != LoginStatus::NOT_LOGGED_IN) {
login_status = LoginStatus::LOCKED;
}

Powered by Google App Engine
This is Rietveld 408576698