Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: chrome/chrome_browser_ui.gypi

Issue 1926173002: Erase LinkDisambiguation code on desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another merge conflict Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # There are two sections of sources: 7 # There are two sections of sources:
8 # * "Platform"-based sources (OS, toolkit, etc.) 8 # * "Platform"-based sources (OS, toolkit, etc.)
9 # * Feature/directory-based sources (e.g., history, printing) 9 # * Feature/directory-based sources (e.g., history, printing)
10 10
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 'browser/ui/ime/ime_window.cc', 682 'browser/ui/ime/ime_window.cc',
683 'browser/ui/ime/ime_window.h', 683 'browser/ui/ime/ime_window.h',
684 'browser/ui/views/crypto_module_password_dialog_view.cc', 684 'browser/ui/views/crypto_module_password_dialog_view.cc',
685 'browser/ui/views/crypto_module_password_dialog_view.h', 685 'browser/ui/views/crypto_module_password_dialog_view.h',
686 'browser/ui/views/desktop_media_picker_views.cc', 686 'browser/ui/views/desktop_media_picker_views.cc',
687 'browser/ui/views/desktop_media_picker_views.h', 687 'browser/ui/views/desktop_media_picker_views.h',
688 'browser/ui/views/ime/ime_window_frame_view.cc', 688 'browser/ui/views/ime/ime_window_frame_view.cc',
689 'browser/ui/views/ime/ime_window_frame_view.h', 689 'browser/ui/views/ime/ime_window_frame_view.h',
690 'browser/ui/views/ime/ime_window_view.cc', 690 'browser/ui/views/ime/ime_window_view.cc',
691 'browser/ui/views/ime/ime_window_view.h', 691 'browser/ui/views/ime/ime_window_view.h',
692 'browser/ui/views/link_disambiguation/link_disambiguation_popup.cc',
693 'browser/ui/views/link_disambiguation/link_disambiguation_popup.h',
694 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc' , 692 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc' ,
695 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h', 693 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
696 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc' , 694 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc' ,
697 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h', 695 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
698 'browser/ui/window_sizer/window_sizer_aura.cc', 696 'browser/ui/window_sizer/window_sizer_aura.cc',
699 ], 697 ],
700 # Aura but not ChromeOS. 698 # Aura but not ChromeOS.
701 'chrome_browser_ui_aura_non_chromeos': [ 699 'chrome_browser_ui_aura_non_chromeos': [
702 'browser/ui/views/frame/desktop_browser_frame_aura.cc', 700 'browser/ui/views/frame/desktop_browser_frame_aura.cc',
703 'browser/ui/views/frame/desktop_browser_frame_aura.h', 701 'browser/ui/views/frame/desktop_browser_frame_aura.h',
(...skipping 2669 matching lines...) Expand 10 before | Expand all | Expand 10 after
3373 ], 3371 ],
3374 'sources': [ 3372 'sources': [
3375 '<@(chrome_browser_ui_non_mobile_sources)', 3373 '<@(chrome_browser_ui_non_mobile_sources)',
3376 '<@(chrome_browser_ui_omnibox_non_mobile_sources)', 3374 '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
3377 ], 3375 ],
3378 }], 3376 }],
3379 ], 3377 ],
3380 }, 3378 },
3381 ], 3379 ],
3382 } 3380 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698