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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 144443003: Unify desktop and Android tab helper instantiation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: using fix Created 6 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
« chrome/browser/ui/tab_helpers.h ('K') | « chrome/browser/ui/tab_helpers.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index a4dbb983cd85b7c434690cecc6d88659f1d9da93..a152c64b886e4cf169ef7c0e884f1e2c4241d029 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -471,8 +471,6 @@
'browser/ui/browser_otr_state.h',
'browser/ui/browser_ui_prefs.cc',
'browser/ui/browser_ui_prefs.h',
- 'browser/ui/browser_tab_contents.h',
- 'browser/ui/browser_tab_contents.cc',
'browser/ui/browser_tab_restore_service_delegate.cc',
'browser/ui/browser_tab_restore_service_delegate.h',
'browser/ui/browser_tab_strip_model_delegate.cc',
@@ -1611,6 +1609,8 @@
'browser/ui/tab_contents/core_tab_helper_delegate.h',
'browser/ui/tab_contents/tab_contents_iterator.cc',
'browser/ui/tab_contents/tab_contents_iterator.h',
+ 'browser/ui/tab_helpers.h',
+ 'browser/ui/tab_helpers.cc',
'browser/ui/tab_modal_confirm_dialog.h',
'browser/ui/tab_modal_confirm_dialog_delegate.cc',
'browser/ui/tab_modal_confirm_dialog_delegate.h',
@@ -3042,7 +3042,6 @@
'browser/ui/browser_iterator.cc',
'browser/ui/browser_list.cc',
'browser/ui/browser_otr_state.cc',
- 'browser/ui/browser_tab_contents.cc',
'browser/ui/browser_tab_restore_service_delegate.cc',
'browser/ui/browser_tabstrip.cc',
'browser/ui/browser_tabstrip.h',
« chrome/browser/ui/tab_helpers.h ('K') | « chrome/browser/ui/tab_helpers.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698