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

Unified Diff: chrome/browser/policy/policy_browsertest.cc

Issue 2162193003: Separates out accelerators using non-common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@accelerators
Patch Set: sim=20 Created 4 years, 5 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_util_unittest.cc ('k') | chrome/browser/ui/ash/accelerator_commands_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 968217e1f00c4a5b7f27ba3016620aecb1dcdfd6..fc8bca08b5107a9a0eca2aa78676d40a7cd2ab7b 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -11,6 +11,7 @@
#include <utility>
#include <vector>
+#include "ash/accelerators/accelerator_controller_delegate_aura.h"
#include "ash/display/display_manager.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
@@ -732,17 +733,19 @@ class PolicyTest : public InProcessBrowserTest {
// ScreenshotGrabber doesn't own this observer, so the observer's lifetime
// is tied to the test instead.
chrome_screenshot_grabber->screenshot_grabber()->AddObserver(&observer_);
- ash::Shell::GetInstance()->accelerator_controller()->SetScreenshotDelegate(
- std::move(chrome_screenshot_grabber));
+ ash::Shell::GetInstance()
+ ->accelerator_controller_delegate()
+ ->SetScreenshotDelegate(std::move(chrome_screenshot_grabber));
SetScreenshotPolicy(enabled);
ash::Shell::GetInstance()->accelerator_controller()->PerformActionIfEnabled(
ash::TAKE_SCREENSHOT);
content::RunMessageLoop();
- static_cast<ChromeScreenshotGrabber*>(ash::Shell::GetInstance()
- ->accelerator_controller()
- ->screenshot_delegate())
+ static_cast<ChromeScreenshotGrabber*>(
+ ash::Shell::GetInstance()
+ ->accelerator_controller_delegate()
+ ->screenshot_delegate())
->screenshot_grabber()
->RemoveObserver(&observer_);
}
« no previous file with comments | « ash/wm/window_util_unittest.cc ('k') | chrome/browser/ui/ash/accelerator_commands_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698