ash/common/system/tray/system_tray_bubble.cc - Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types

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/tray/system_tray_bubble.cc

Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix conflict Created 4 years, 6 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

Index: ash/common/system/tray/system_tray_bubble.cc

diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/common/system/tray/system_tray_bubble.cc

similarity index 98%

rename from ash/system/tray/system_tray_bubble.cc

rename to ash/common/system/tray/system_tray_bubble.cc

index 9d5cc95158d796fa32ba3b310381ccf6fd563de2..a4826cd47a9c6f3750588fbf63fd734e0267b8ea 100644

--- a/ash/system/tray/system_tray_bubble.cc

+++ b/ash/common/system/tray/system_tray_bubble.cc

@@ -2,16 +2,15 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "ash/system/tray/system_tray_bubble.h"

+#include "ash/common/system/tray/system_tray_bubble.h"

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

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

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

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

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

#include "ash/common/wm_shell.h"

-#include "ash/shell.h"

#include "ash/system/tray/system_tray.h"

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

#include "base/threading/thread_task_runner_handle.h"

#include "ui/compositor/layer.h"

#include "ui/compositor/layer_animation_observer.h"

« no previous file with comments | « ash/common/system/tray/system_tray_bubble.h ('k') | ash/common/system/tray/tray_background_view.h » ('j') | no next file with comments »