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

Unified Diff: chrome/browser/ui/views/chrome_views_delegate_chromeos.cc

Issue 2752593008: Move AcceleratorController from WmShell to Shell (Closed)
Patch Set: fix include Created 3 years, 9 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 | « chrome/browser/ui/browser_commands_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/chrome_views_delegate_chromeos.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc b/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc
index acf1470a28caf793f0bcd659637ebb15f5a87c4b..805731903dcd3714798acc5a14362c7d01460ffb 100644
--- a/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc
@@ -6,7 +6,6 @@
#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/wm/window_state.h"
-#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/wm/window_state_aura.h"
#include "base/bind.h"
@@ -21,7 +20,7 @@ namespace {
void ProcessAcceleratorNow(const ui::Accelerator& accelerator) {
// TODO(afakhry): See if we need here to send the accelerator to the
// FocusManager of the active window in a follow-up CL.
- ash::WmShell::Get()->accelerator_controller()->Process(accelerator);
+ ash::Shell::Get()->accelerator_controller()->Process(accelerator);
}
} // namespace
@@ -36,7 +35,7 @@ ChromeViewsDelegate::ProcessAcceleratorWhileMenuShowing(
return views::ViewsDelegate::ProcessMenuAcceleratorResult::LEAVE_MENU_OPEN;
ash::AcceleratorController* accelerator_controller =
- ash::WmShell::Get()->accelerator_controller();
+ ash::Shell::Get()->accelerator_controller();
accelerator_controller->accelerator_history()->StoreCurrentAccelerator(
accelerator);
« no previous file with comments | « chrome/browser/ui/browser_commands_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698