diff options
| author | sadrul <sadrul@chromium.org> | 2015-10-28 20:30:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-29 03:31:05 +0000 |
| commit | 17568d1fbcd63f4c5f03c3cf5f21d980e24c55bc (patch) | |
| tree | 1ae3db0d00993a4646ea0a25152094f4a843297f /mandoline | |
| parent | a7df9efb7b0f58fa942bf4e264001de1996f3302 (diff) | |
| download | chromium_src-17568d1fbcd63f4c5f03c3cf5f21d980e24c55bc.zip chromium_src-17568d1fbcd63f4c5f03c3cf5f21d980e24c55bc.tar.gz chromium_src-17568d1fbcd63f4c5f03c3cf5f21d980e24c55bc.tar.bz2 | |
mus: Change namespace from mojo to mus.mojom for events.
BUG=548376
Review URL: https://codereview.chromium.org/1424923003
Cr-Commit-Position: refs/heads/master@{#356754}
Diffstat (limited to 'mandoline')
| -rw-r--r-- | mandoline/ui/desktop_ui/browser_window.cc | 44 | ||||
| -rw-r--r-- | mandoline/ui/desktop_ui/browser_window.h | 2 |
2 files changed, 26 insertions, 20 deletions
diff --git a/mandoline/ui/desktop_ui/browser_window.cc b/mandoline/ui/desktop_ui/browser_window.cc index a6db187..d30e99b 100644 --- a/mandoline/ui/desktop_ui/browser_window.cc +++ b/mandoline/ui/desktop_ui/browser_window.cc @@ -183,24 +183,30 @@ void BrowserWindow::OnEmbed(mus::Window* root) { web_view_.Init(app_, content_); - host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::CLOSE), - mus::CreateKeyMatcher(mojo::KEYBOARD_CODE_W, - mojo::EVENT_FLAGS_CONTROL_DOWN)); - host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::FOCUS_OMNIBOX), - mus::CreateKeyMatcher(mojo::KEYBOARD_CODE_L, - mojo::EVENT_FLAGS_CONTROL_DOWN)); - host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::NEW_WINDOW), - mus::CreateKeyMatcher(mojo::KEYBOARD_CODE_N, - mojo::EVENT_FLAGS_CONTROL_DOWN)); - host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::SHOW_FIND), - mus::CreateKeyMatcher(mojo::KEYBOARD_CODE_F, - mojo::EVENT_FLAGS_CONTROL_DOWN)); - host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::GO_BACK), - mus::CreateKeyMatcher(mojo::KEYBOARD_CODE_LEFT, - mojo::EVENT_FLAGS_ALT_DOWN)); - host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::GO_FORWARD), - mus::CreateKeyMatcher(mojo::KEYBOARD_CODE_RIGHT, - mojo::EVENT_FLAGS_ALT_DOWN)); + host_->AddAccelerator( + static_cast<uint32_t>(BrowserCommand::CLOSE), + mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_W, + mus::mojom::EVENT_FLAGS_CONTROL_DOWN)); + host_->AddAccelerator( + static_cast<uint32_t>(BrowserCommand::FOCUS_OMNIBOX), + mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_L, + mus::mojom::EVENT_FLAGS_CONTROL_DOWN)); + host_->AddAccelerator( + static_cast<uint32_t>(BrowserCommand::NEW_WINDOW), + mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N, + mus::mojom::EVENT_FLAGS_CONTROL_DOWN)); + 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)); // Now that we're ready, load the default url. LoadURL(default_url_); @@ -232,7 +238,7 @@ void BrowserWindow::OnConnectionLost(mus::WindowTreeConnection* connection) { //////////////////////////////////////////////////////////////////////////////// // BrowserWindow, mus::ViewTreeHostClient implementation: -void BrowserWindow::OnAccelerator(uint32_t id, mojo::EventPtr event) { +void BrowserWindow::OnAccelerator(uint32_t id, mus::mojom::EventPtr event) { switch (static_cast<BrowserCommand>(id)) { case BrowserCommand::CLOSE: Close(); diff --git a/mandoline/ui/desktop_ui/browser_window.h b/mandoline/ui/desktop_ui/browser_window.h index c3606fe..1f60ccd 100644 --- a/mandoline/ui/desktop_ui/browser_window.h +++ b/mandoline/ui/desktop_ui/browser_window.h @@ -61,7 +61,7 @@ class BrowserWindow : public mus::WindowTreeDelegate, void OnConnectionLost(mus::WindowTreeConnection* connection) override; // Overridden from WindowTreeHostClient: - void OnAccelerator(uint32_t id, mojo::EventPtr event) override; + void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override; // Overridden from web_view::mojom::WebViewClient: void TopLevelNavigateRequest(mojo::URLRequestPtr request) override; |