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

Unified Diff: chrome/browser/ui/ash/ash_init.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/ash_init.cc
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index 54c8f287ce07a83e95cc273b504c51f7df9e4434..2f8c27000acfbf6fd06b572b68c25816a6384bc5 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -7,11 +7,11 @@
#include "ash/accelerators/accelerator_controller.h"
#include "ash/accelerators/accelerator_controller_delegate_aura.h"
#include "ash/accessibility_types.h"
-#include "ash/aura/wm_shell_aura.h"
+#include "ash/aura/shell_port_classic.h"
#include "ash/high_contrast/high_contrast_controller.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/magnifier/partial_magnification_controller.h"
-#include "ash/mus/bridge/wm_shell_mus.h"
+#include "ash/mus/bridge/shell_port_mash.h"
#include "ash/mus/window_manager.h"
#include "ash/public/cpp/config.h"
#include "ash/shell.h"
@@ -110,10 +110,10 @@ AshInit::AshInit() {
nullptr;
if (chromeos::GetAshConfig() == ash::Config::CLASSIC) {
accelerator_controller_delegate =
- ash::WmShellAura::Get()->accelerator_controller_delegate();
+ ash::ShellPortClassic::Get()->accelerator_controller_delegate();
} else if (chromeos::GetAshConfig() == ash::Config::MUS) {
accelerator_controller_delegate =
- ash::mus::WmShellMus::Get()->accelerator_controller_delegate_mus();
+ ash::mus::ShellPortMash::Get()->accelerator_controller_delegate_mus();
}
if (accelerator_controller_delegate) {
std::unique_ptr<ChromeScreenshotGrabber> screenshot_delegate =

Powered by Google App Engine
This is Rietveld 408576698