ash/common/system/chromeos/session/logout_button_tray.cc - Issue 2376103005: mustash: Break dependency of //ash/public/interfaces on //ash

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/session/logout_button_tray.cc

Issue 2376103005: mustash: Break dependency of //ash/public/interfaces on //ash (Closed)

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

Index: ash/common/system/chromeos/session/logout_button_tray.cc

diff --git a/ash/common/system/chromeos/session/logout_button_tray.cc b/ash/common/system/chromeos/session/logout_button_tray.cc

index f24c367331a18bd2eca63edd479f2458fc964640..4e66f31c386f66ba9b6ddc065c4cc0a74e47d423 100644

--- a/ash/common/system/chromeos/session/logout_button_tray.cc

+++ b/ash/common/system/chromeos/session/logout_button_tray.cc

@@ -8,7 +8,6 @@

#include <utility>

#include "ash/common/material_design/material_design_controller.h"

-#include "ash/common/shelf/shelf_types.h"

#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"

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

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

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

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

#include "ash/common/system/user/login_status.h"

#include "ash/common/wm_shell.h"

+#include "ash/public/cpp/shelf_types.h"

#include "base/logging.h"

#include "grit/ash_resources.h"

#include "third_party/skia/include/core/SkColor.h"