ash/common/system/chromeos/palette/palette_tray.cc - 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.cc

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: new approach Created 4 years, 5 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

« no previous file with comments | « ash/common/system/chromeos/palette/palette_tray.h ('k') | ash/common/system/chromeos/session/logout_button_tray.h » ('j') | ash/common/system/view_observer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c4cdadfd68a5b4a8955aa38dea9b1bbc37f02383..f8872e7fe2219ba26b1d6dd85498577ee38c5807 100644

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

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

@@ -15,6 +15,7 @@

#include "ash/common/system/tray/tray_bubble_wrapper.h"

#include "ash/common/system/tray/tray_constants.h"

#include "ash/common/system/tray/tray_popup_header_button.h"

+#include "ash/common/system/view_observer.h"

#include "ash/common/wm_lookup.h"

#include "ash/common/wm_root_window_controller.h"

#include "ash/common/wm_shell.h"

@@ -106,8 +107,8 @@ views::View* CreateTitleView() {

} // namespace

-PaletteTray::PaletteTray(WmShelf* wm_shelf)

- : TrayBackgroundView(wm_shelf),

+PaletteTray::PaletteTray(WmShelf* wm_shelf, ViewObserver* view_observer)

+ : TrayBackgroundView(wm_shelf, view_observer),

palette_tool_manager_(new PaletteToolManager(this)) {

PaletteTool::RegisterToolInstances(palette_tool_manager_.get());