diff options
| author | msw <msw@chromium.org> | 2016-03-21 11:08:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-21 18:09:56 +0000 |
| commit | bc1cee6f1db69579e72287bdd1aca442ca904ec2 (patch) | |
| tree | c3b988d0b6fbf7acc0b9098ac371a1b0ce4f8919 /mash | |
| parent | ee50736c96ca97939d5b99543f3e0b297fd88029 (diff) | |
| download | chromium_src-bc1cee6f1db69579e72287bdd1aca442ca904ec2.zip chromium_src-bc1cee6f1db69579e72287bdd1aca442ca904ec2.tar.gz chromium_src-bc1cee6f1db69579e72287bdd1aca442ca904ec2.tar.bz2 | |
Add simple mash context menu support.
Add ash/mus/context_menu_mus.* for mash context menus.
(populates local ash items like ash_shell_with_content)
Tangential ShelfView refactoring (can be split).
BUG=557406
TEST="chrome --mash" context menus appear.
R=sky@chromium.org
Review URL: https://codereview.chromium.org/1760743002
Cr-Commit-Position: refs/heads/master@{#382326}
Diffstat (limited to 'mash')
| -rw-r--r-- | mash/screenlock/screenlock.h | 2 | ||||
| -rw-r--r-- | mash/wm/window_manager.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mash/screenlock/screenlock.h b/mash/screenlock/screenlock.h index f7d1723..3808f5a 100644 --- a/mash/screenlock/screenlock.h +++ b/mash/screenlock/screenlock.h @@ -33,7 +33,7 @@ class Screenlock : public mojo::ShellClient, const mojo::Identity& identity, uint32_t id) override; - // mash::shell::mojom::ScreenlockStateListener: + // session::mojom::ScreenlockStateListener: void ScreenlockStateChanged(bool locked) override; mojo::TracingImpl tracing_; diff --git a/mash/wm/window_manager.h b/mash/wm/window_manager.h index 96c0b8a..ffa8919 100644 --- a/mash/wm/window_manager.h +++ b/mash/wm/window_manager.h @@ -55,7 +55,7 @@ class WindowManager : public mus::WindowObserver, std::map<std::string, std::vector<uint8_t>>* properties) override; void OnAccelerator(uint32_t id, const ui::Event& event) override; - // mash::shell::mojom::ScreenlockStateListener: + // session::mojom::ScreenlockStateListener: void ScreenlockStateChanged(bool locked) override; RootWindowController* root_controller_; |