chrome/chrome_browser_ui.gypi - Issue 768413003: TEST ONLY - DO NOT SUBMIT - FOR TRYBOTS

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 768413003: TEST ONLY - DO NOT SUBMIT - FOR TRYBOTS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix bad merge Created 5 years, 11 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 0ca524a7e4467149f1feea683d164668d356c9a7..6b30b9e4bb6edf56945b2ba209d393887f33aa9c 100644

--- a/chrome/chrome_browser_ui.gypi

+++ b/chrome/chrome_browser_ui.gypi

@@ -555,12 +555,8 @@

'browser/ui/cocoa/location_bar/manage_passwords_decoration.mm',

'browser/ui/cocoa/location_bar/mic_search_decoration.h',

'browser/ui/cocoa/location_bar/mic_search_decoration.mm',

- 'browser/ui/cocoa/location_bar/origin_chip_decoration.h',

- 'browser/ui/cocoa/location_bar/origin_chip_decoration.mm',

'browser/ui/cocoa/location_bar/page_action_decoration.h',

'browser/ui/cocoa/location_bar/page_action_decoration.mm',

- 'browser/ui/cocoa/location_bar/search_button_decoration.h',

- 'browser/ui/cocoa/location_bar/search_button_decoration.mm',

'browser/ui/cocoa/location_bar/selected_keyword_decoration.h',

'browser/ui/cocoa/location_bar/selected_keyword_decoration.mm',

'browser/ui/cocoa/location_bar/star_decoration.h',

@@ -1463,8 +1459,6 @@

'browser/ui/location_bar/location_bar.h',

'browser/ui/location_bar/location_bar_util.cc',

'browser/ui/location_bar/location_bar_util.h',

- 'browser/ui/location_bar/origin_chip_info.cc',

- 'browser/ui/location_bar/origin_chip_info.h',

'browser/ui/native_window_tracker.h',

'browser/ui/panels/detached_panel_collection.cc',

'browser/ui/panels/detached_panel_collection.h',

@@ -2180,16 +2174,12 @@

'browser/ui/views/location_bar/location_icon_view.h',

'browser/ui/views/location_bar/open_pdf_in_reader_view.cc',

'browser/ui/views/location_bar/open_pdf_in_reader_view.h',

- 'browser/ui/views/location_bar/origin_chip_view.cc',

- 'browser/ui/views/location_bar/origin_chip_view.h',

'browser/ui/views/location_bar/page_action_image_view.cc',

'browser/ui/views/location_bar/page_action_image_view.h',

'browser/ui/views/location_bar/page_action_with_badge_view.cc',

'browser/ui/views/location_bar/page_action_with_badge_view.h',

'browser/ui/views/location_bar/page_info_helper.cc',

'browser/ui/views/location_bar/page_info_helper.h',

- 'browser/ui/views/location_bar/search_button.cc',

- 'browser/ui/views/location_bar/search_button.h',

'browser/ui/views/location_bar/selected_keyword_view.cc',

'browser/ui/views/location_bar/selected_keyword_view.h',

'browser/ui/views/location_bar/star_view.cc',

« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_views.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »