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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.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: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
index f94d0217abba5fef16b54dd367ccb9b73cbc0ae6..a2483e545a3a2dd3c7bfcda58f7bfae37e9e31ed 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
@@ -16,10 +16,10 @@
#include "ash/shelf/shelf_model.h"
#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/wm/window_util.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "base/command_line.h"
#include "base/macros.h"
@@ -1335,7 +1335,7 @@ void ChromeLauncherControllerImpl::OnDisplayConfigurationChanged() {
// Because it might be called by some operations, like crbug.com/627040
// rotating screen.
ash::WmShelf* shelf =
- ash::WmShelf::ForWindow(ash::WmShell::Get()->GetPrimaryRootWindow());
+ ash::WmShelf::ForWindow(ash::ShellPort::Get()->GetPrimaryRootWindow());
if (shelf->alignment() != ash::SHELF_ALIGNMENT_BOTTOM_LOCKED)
SetShelfBehaviorsFromPrefs();
}

Powered by Google App Engine
This is Rietveld 408576698