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

Unified Diff: mandoline/ui/desktop_ui/browser_window.cc

Issue 1487333004: mus: Notify the client whether adding an accelerator was successful. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years 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 | « components/mus/ws/window_tree_host_impl.cc ('k') | mash/wm/window_manager_application.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/ui/desktop_ui/browser_window.cc
diff --git a/mandoline/ui/desktop_ui/browser_window.cc b/mandoline/ui/desktop_ui/browser_window.cc
index 6100a579f5b203b2faed756fb8c87caeafb89835..c0bda9e0a6338dc6a57c646e123e5684c7729eac 100644
--- a/mandoline/ui/desktop_ui/browser_window.cc
+++ b/mandoline/ui/desktop_ui/browser_window.cc
@@ -208,27 +208,31 @@ void BrowserWindow::OnEmbed(mus::Window* root) {
host_->AddAccelerator(
static_cast<uint32_t>(BrowserCommand::CLOSE),
mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_W,
- mus::mojom::EVENT_FLAGS_CONTROL_DOWN));
+ mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+ mus::mojom::WindowTreeHost::AddAcceleratorCallback());
host_->AddAccelerator(
static_cast<uint32_t>(BrowserCommand::FOCUS_OMNIBOX),
mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_L,
- mus::mojom::EVENT_FLAGS_CONTROL_DOWN));
+ mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+ mus::mojom::WindowTreeHost::AddAcceleratorCallback());
host_->AddAccelerator(
static_cast<uint32_t>(BrowserCommand::NEW_WINDOW),
mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N,
- mus::mojom::EVENT_FLAGS_CONTROL_DOWN));
+ mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+ mus::mojom::WindowTreeHost::AddAcceleratorCallback());
host_->AddAccelerator(
static_cast<uint32_t>(BrowserCommand::SHOW_FIND),
mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_F,
- mus::mojom::EVENT_FLAGS_CONTROL_DOWN));
- host_->AddAccelerator(
- static_cast<uint32_t>(BrowserCommand::GO_BACK),
- mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_LEFT,
- mus::mojom::EVENT_FLAGS_ALT_DOWN));
- host_->AddAccelerator(
- static_cast<uint32_t>(BrowserCommand::GO_FORWARD),
- mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_RIGHT,
- mus::mojom::EVENT_FLAGS_ALT_DOWN));
+ mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+ mus::mojom::WindowTreeHost::AddAcceleratorCallback());
+ host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::GO_BACK),
+ mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_LEFT,
+ mus::mojom::EVENT_FLAGS_ALT_DOWN),
+ mus::mojom::WindowTreeHost::AddAcceleratorCallback());
+ host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::GO_FORWARD),
+ mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_RIGHT,
+ mus::mojom::EVENT_FLAGS_ALT_DOWN),
+ mus::mojom::WindowTreeHost::AddAcceleratorCallback());
// Now that we're ready, load the default url.
LoadURL(default_url_);
« no previous file with comments | « components/mus/ws/window_tree_host_impl.cc ('k') | mash/wm/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698