ash/common/system/chromeos/palette/palette_tray.h - Issue 2147143002: [Chrome OS MD] Draw a 1px separator between 2 tray items

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/common/system/chromeos/palette/palette_tray.h

Issue 2147143002: [Chrome OS MD] Draw a 1px separator between 2 tray items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 4 years, 4 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

« ash/common/system/chromeos/ime_menu/ime_menu_tray.h ('K') | « ash/common/system/chromeos/ime_menu/ime_menu_tray.cc ('k') | ash/common/system/chromeos/palette/palette_tray.cc » ('j') | ash/common/system/chromeos/session/logout_button_tray.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/system/chromeos/palette/palette_tray.h

diff --git a/ash/common/system/chromeos/palette/palette_tray.h b/ash/common/system/chromeos/palette/palette_tray.h

index dcd387cffe49a9b222d434747f214f47bff24da3..241bf11ac2719564b207613834db4f772c90ff13 100644

--- a/ash/common/system/chromeos/palette/palette_tray.h

+++ b/ash/common/system/chromeos/palette/palette_tray.h

@@ -24,6 +24,7 @@ namespace ash {

class TrayBubbleWrapper;

class PaletteToolManager;

+class WmShelfObserver;

// The PaletteTray shows the palette in the bottom area of the screen. This

// class also controls the lifetime for all of the tools available in the

@@ -34,7 +35,7 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,

public PaletteToolManager::Delegate,

public views::TrayBubbleView::Delegate {

public:

- explicit PaletteTray(WmShelf* wm_shelf);

+ explicit PaletteTray(WmShelf* wm_shelf, WmShelfObserver* wm_shelf_observer);

James Cook 2016/08/09 00:25:17 ditto

yiyix 2016/08/11 01:23:18 Done.

~PaletteTray() override;

// ActionableView: