diff options
| author | sadrul <sadrul@chromium.org> | 2016-02-09 13:18:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-09 21:20:28 +0000 |
| commit | dfd7833ae942a8339853ed02907bb31e0806badc (patch) | |
| tree | f4a269b7c5716b0b4ac4a64907d07ce25e1de6bb /ash/system | |
| parent | 33e36ef54fb34b0e5e8b377357b3dc3a4c2c4602 (diff) | |
| download | chromium_src-dfd7833ae942a8339853ed02907bb31e0806badc.zip chromium_src-dfd7833ae942a8339853ed02907bb31e0806badc.tar.gz chromium_src-dfd7833ae942a8339853ed02907bb31e0806badc.tar.bz2 | |
ash/mash: Add a mus-client that sets up ash to provide the system ui for mash.
We only want a small number of the components of ash (e.g. shelf, wallpaper,
system-tray, app-list) etc. for mash, but for now, the mus-client loads all of
ash. The bare minimum set of delegates have stub implementations. These will
grow as we hook them up with other mojo/mus services.
BUG=585141
Review URL: https://codereview.chromium.org/1676713002
Cr-Commit-Position: refs/heads/master@{#374470}
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/web_notification/ash_popup_alignment_delegate.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.h b/ash/system/web_notification/ash_popup_alignment_delegate.h index d4dbffa..fccd70e 100644 --- a/ash/system/web_notification/ash_popup_alignment_delegate.h +++ b/ash/system/web_notification/ash_popup_alignment_delegate.h @@ -84,7 +84,6 @@ class ASH_EXPORT AshPopupAlignmentDelegate gfx::Screen* screen_; gfx::Rect work_area_; - aura::Window* root_window_; ShelfLayoutManager* shelf_; int system_tray_height_; |