diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-29 16:15:49 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-29 16:15:49 +0000 |
| commit | 54d36881013349cd42e0525c30860f655710a029 (patch) | |
| tree | cfe5966906d052249cbe22f38d387d4da0389726 /chrome/chrome_browser.gypi | |
| parent | 8759782e334bf963cd385cb8a7f89400afe21b7f (diff) | |
| download | chromium_src-54d36881013349cd42e0525c30860f655710a029.zip chromium_src-54d36881013349cd42e0525c30860f655710a029.tar.gz chromium_src-54d36881013349cd42e0525c30860f655710a029.tar.bz2 | |
Revert 45936 - The app launcher now uses the location bar (instead of the autocomplete edit), so
it has "tab to search" and the icons on the left side,
Also split location_bar_view.cc so that every innerclass gets its own .h and .cc
file.
BUG=None
TEST=Make sure the location bar works as expected (tab to search, bookmark star,
page actions...).
Open the app launcher, make sure "tab to search" works as expected.
Review URL: http://codereview.chromium.org/1746009
TBR=jcivelli@google.com
Review URL: http://codereview.chromium.org/1737021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 46 |
1 files changed, 2 insertions, 44 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index a47c61b..332e351 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2313,28 +2313,8 @@ 'browser/views/local_storage_info_view.h', 'browser/views/local_storage_set_item_info_view.cc', 'browser/views/local_storage_set_item_info_view.h', - 'browser/views/location_bar/click_handler.cc', - 'browser/views/location_bar/click_handler.h', - 'browser/views/location_bar/content_setting_image_view.cc', - 'browser/views/location_bar/content_setting_image_view.h', - 'browser/views/location_bar/ev_bubble_view.cc', - 'browser/views/location_bar/ev_bubble_view.h', - 'browser/views/location_bar/icon_label_bubble_view.h', - 'browser/views/location_bar/icon_label_bubble_view.cc', - 'browser/views/location_bar/keyword_hint_view.cc', - 'browser/views/location_bar/keyword_hint_view.h', - 'browser/views/location_bar/location_icon_view.cc', - 'browser/views/location_bar/location_icon_view.h', - 'browser/views/location_bar/location_bar_view.cc', - 'browser/views/location_bar/location_bar_view.h', - 'browser/views/location_bar/page_action_image_view.cc', - 'browser/views/location_bar/page_action_image_view.h', - 'browser/views/location_bar/page_action_with_badge_view.cc', - 'browser/views/location_bar/page_action_with_badge_view.h', - 'browser/views/location_bar/selected_keyword_view.h', - 'browser/views/location_bar/selected_keyword_view.cc', - 'browser/views/location_bar/star_view.cc', - 'browser/views/location_bar/star_view.h', + 'browser/views/location_bar_view.cc', + 'browser/views/location_bar_view.h', 'browser/views/login_view.cc', 'browser/views/login_view.h', 'browser/views/modal_dialog_delegate.cc', @@ -2927,28 +2907,6 @@ ['include', '^browser/views/infobars/*'], ['include', '^browser/views/info_bubble.cc'], ['include', '^browser/views/info_bubble.h'], - ['include', '^browser/views/location_bar/click_handler.cc'], - ['include', '^browser/views/location_bar/click_handler.h'], - ['include', '^browser/views/location_bar/content_setting_image_view.cc'], - ['include', '^browser/views/location_bar/content_setting_image_view.h'], - ['include', '^browser/views/location_bar/ev_bubble_view.cc'], - ['include', '^browser/views/location_bar/ev_bubble_view.h'], - ['include', '^browser/views/location_bar/icon_label_bubble_view.h'], - ['include', '^browser/views/location_bar/icon_label_bubble_view.cc'], - ['include', '^browser/views/location_bar/keyword_hint_view.cc'], - ['include', '^browser/views/location_bar/keyword_hint_view.h'], - ['include', '^browser/views/location_bar/location_icon_view.cc'], - ['include', '^browser/views/location_bar/location_icon_view.h'], - ['include', '^browser/views/location_bar/location_bar_view.cc'], - ['include', '^browser/views/location_bar/location_bar_view.h'], - ['include', '^browser/views/location_bar/page_action_image_view.cc'], - ['include', '^browser/views/location_bar/page_action_image_view.h'], - ['include', '^browser/views/location_bar/page_action_with_badge_view.h'], - ['include', '^browser/views/location_bar/page_action_with_badge_view.cc'], - ['include', '^browser/views/location_bar/selected_keyword_view.h'], - ['include', '^browser/views/location_bar/selected_keyword_view.cc'], - ['include', '^browser/views/location_bar/star_view.cc'], - ['include', '^browser/views/location_bar/star_view.h'], ['include', '^browser/views/location_bar_view.cc'], ['include', '^browser/views/location_bar_view.h'], ['include', '^browser/views/options/options_page_view.cc'], |