chrome/chrome_browser_ui.gypi - Issue 636853002: Common code from linux and windows implementations of SystemTrayDelegate

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: chrome/chrome_browser_ui.gypi

Issue 636853002: Common code from linux and windows implementations of SystemTrayDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 6 years, 2 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: chrome/chrome_browser_ui.gypi

diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi

index 670bf918c7c6ae215be5a740840f01535e7d75d7..94a196e6ef646267f15721203bbb83e27603cf02 100644

--- a/chrome/chrome_browser_ui.gypi

+++ b/chrome/chrome_browser_ui.gypi

@@ -1298,12 +1298,12 @@

'browser/ui/views/frame/native_browser_frame_factory_desktop_ash.cc',

'browser/ui/views/network_profile_bubble_view.cc',

'browser/ui/views/network_profile_bubble_view.h',

+ 'browser/ui/views/uninstall_view.cc',

+ 'browser/ui/views/uninstall_view.h',

'browser/ui/webui/conflicts_ui.cc',

'browser/ui/webui/conflicts_ui.h',

'browser/ui/webui/set_as_default_browser_ui.cc',

'browser/ui/webui/set_as_default_browser_ui.h',

- 'browser/ui/views/uninstall_view.cc',

- 'browser/ui/views/uninstall_view.h',

'chrome_browser_ui_mac_sources': [

'browser/ui/startup/session_crashed_bubble.cc',

@@ -2416,12 +2416,10 @@

'browser/ui/ash/solid_color_user_wallpaper_delegate.h',

'browser/ui/ash/system_tray_delegate_chromeos.cc',

'browser/ui/ash/system_tray_delegate_chromeos.h',

- 'browser/ui/ash/system_tray_delegate_linux.cc',

- 'browser/ui/ash/system_tray_delegate_linux.h',

+ 'browser/ui/ash/system_tray_delegate_common.cc',

+ 'browser/ui/ash/system_tray_delegate_common.h',

'browser/ui/ash/system_tray_delegate_utils.cc',

'browser/ui/ash/system_tray_delegate_utils.h',

- 'browser/ui/ash/system_tray_delegate_win.cc',

- 'browser/ui/ash/system_tray_delegate_win.h',

'browser/ui/ash/user_accounts_delegate_chromeos.cc',

'browser/ui/ash/user_accounts_delegate_chromeos.h',

'browser/ui/ash/volume_controller_chromeos.cc',

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_win.cc ('k') | no next file » | no next file with comments »