diff options
author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 00:19:04 +0000 |
---|---|---|
committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 00:19:04 +0000 |
commit | 736d1898191dc530e603a996d8c4bf2415326aa7 (patch) | |
tree | 79c524d49f164c8c970b119279be072aaaaee91d /chrome/chrome_tests.gypi | |
parent | 2dee6d5003f0d5a9fffd55856b9f54b404988cab (diff) | |
download | chromium_src-736d1898191dc530e603a996d8c4bf2415326aa7.zip chromium_src-736d1898191dc530e603a996d8c4bf2415326aa7.tar.gz chromium_src-736d1898191dc530e603a996d8c4bf2415326aa7.tar.bz2 |
Move chrome/browser/gtk/ to chrome/browser/ui/gtk/
(moved *.cc using 'svn mv' to preserve history)
(copied *.h using 'svn cp' to preserve history and stub out originals)
Stubbed out original headers in chrome/browser/gtk/
Update header guards & copyright dates in chrome/browser/ui/gtk/
Update .gypi files
Remove chrome/chrome_browser.gypi:4228 reference to nonexistant:
['include', '^browser/gtk/pk11_password_dialog.h'],
Remove stray header guard in:
chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.cc
Add #pragma once to the following files:
chrome/browser/ui/gtk/instant_confirm_dialog_gtk.h
chrome/browser/ui/gtk/infobar_arrow_model.h
Ran the following to appease presubmit: 'svn pset svn:eol-style LF \
chrome/browser/ui/gtk/info_bubble_accelerators_gtk.cc \
chrome/browser/ui/gtk/gtk_custom_menu.cc \
chrome/browser/ui/gtk/info_bubble_accelerators_gtk.h \
chrome/browser/ui/gtk/gtk_custom_menu.h \
chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.h \
chrome/browser/ui/gtk/chrome_gtk_frame.h \
chrome/browser/ui/gtk/chrome_gtk_frame.cc \
chrome/browser/ui/gtk/gtk_custom_menu_item.h \
chrome/browser/gtk/info_bubble_accelerators_gtk.h \
chrome/browser/gtk/gtk_custom_menu.h \
chrome/browser/gtk/options/managed_prefs_banner_gtk.h \
chrome/browser/gtk/chrome_gtk_frame.h \
chrome/browser/gtk/gtk_custom_menu_item.h'
BUG=69289
TEST=Compile&Trybots
Review URL: http://codereview.chromium.org/6251001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r-- | chrome/chrome_tests.gypi | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index ca9aec5..716b8f5 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -328,7 +328,7 @@ 'browser/browser_keyevents_browsertest.cc', 'browser/collected_cookies_uitest.cc', 'browser/debugger/devtools_sanity_unittest.cc', - 'browser/gtk/bookmark_bar_gtk_interactive_uitest.cc', + 'browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc', 'browser/instant/instant_browsertest.cc', 'browser/notifications/notifications_interactive_uitest.cc', 'browser/ui/views/bookmark_bar_view_test.cc', @@ -369,7 +369,7 @@ }], ['OS=="linux" and toolkit_views==1', { 'sources!': [ - 'browser/gtk/bookmark_bar_gtk_interactive_uitest.cc', + 'browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc', # TODO(port) 'test/interactive_ui/npapi_interactive_test.cc', ], @@ -1202,20 +1202,20 @@ 'browser/google/google_update_settings_unittest.cc', 'browser/google/google_url_tracker_unittest.cc', 'browser/gpu_blacklist_unittest.cc', - 'browser/gtk/accessibility_event_router_gtk_unittest.cc', - 'browser/gtk/bookmark_bar_gtk_unittest.cc', - 'browser/gtk/bookmark_editor_gtk_unittest.cc', - 'browser/gtk/bookmark_utils_gtk_unittest.cc', - 'browser/gtk/gtk_chrome_shrinkable_hbox_unittest.cc', - 'browser/gtk/gtk_expanded_container_unittest.cc', - 'browser/gtk/gtk_theme_provider_unittest.cc', - 'browser/gtk/keyword_editor_view_unittest.cc', - 'browser/gtk/options/content_exceptions_window_gtk_unittest.cc', - 'browser/gtk/options/cookies_view_unittest.cc', - 'browser/gtk/options/languages_page_gtk_unittest.cc', - 'browser/gtk/reload_button_gtk_unittest.cc', - 'browser/gtk/status_icons/status_tray_gtk_unittest.cc', - 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', + 'browser/ui/gtk/accessibility_event_router_gtk_unittest.cc', + 'browser/ui/gtk/bookmark_bar_gtk_unittest.cc', + 'browser/ui/gtk/bookmark_editor_gtk_unittest.cc', + 'browser/ui/gtk/bookmark_utils_gtk_unittest.cc', + 'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc', + 'browser/ui/gtk/gtk_expanded_container_unittest.cc', + 'browser/ui/gtk/gtk_theme_provider_unittest.cc', + 'browser/ui/gtk/keyword_editor_view_unittest.cc', + 'browser/ui/gtk/options/content_exceptions_window_gtk_unittest.cc', + 'browser/ui/gtk/options/cookies_view_unittest.cc', + 'browser/ui/gtk/options/languages_page_gtk_unittest.cc', + 'browser/ui/gtk/reload_button_gtk_unittest.cc', + 'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc', + 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', 'browser/history/expire_history_backend_unittest.cc', 'browser/history/history_backend_unittest.cc', 'browser/history/history_querying_unittest.cc', @@ -1780,15 +1780,15 @@ ['toolkit_views==1', { 'sources!': [ 'browser/autocomplete/autocomplete_popup_view_gtk_unittest.cc', - 'browser/gtk/bookmark_bar_gtk_unittest.cc', - 'browser/gtk/bookmark_editor_gtk_unittest.cc', - 'browser/gtk/gtk_chrome_shrinkable_hbox_unittest.cc', - 'browser/gtk/gtk_expanded_container_unittest.cc', - 'browser/gtk/gtk_theme_provider_unittest.cc', - 'browser/gtk/options/cookies_view_unittest.cc', - 'browser/gtk/options/languages_page_gtk_unittest.cc', - 'browser/gtk/reload_button_gtk_unittest.cc', - 'browser/gtk/status_icons/status_tray_gtk_unittest.cc', + 'browser/ui/gtk/bookmark_bar_gtk_unittest.cc', + 'browser/ui/gtk/bookmark_editor_gtk_unittest.cc', + 'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc', + 'browser/ui/gtk/gtk_expanded_container_unittest.cc', + 'browser/ui/gtk/gtk_theme_provider_unittest.cc', + 'browser/ui/gtk/options/cookies_view_unittest.cc', + 'browser/ui/gtk/options/languages_page_gtk_unittest.cc', + 'browser/ui/gtk/reload_button_gtk_unittest.cc', + 'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc', ], }], ], @@ -1802,7 +1802,7 @@ ], }, { # else: OS != "linux" 'sources!': [ - 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', + 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', '../views/focus/accelerator_handler_gtk_unittest.cc', ], @@ -1831,7 +1831,7 @@ # Blocked on bookmark manager. 'browser/bookmarks/bookmark_context_menu_controller_unittest.cc', 'browser/ui/tabs/dock_info_unittest.cc', - 'browser/gtk/reload_button_gtk_unittest.cc', + 'browser/ui/gtk/reload_button_gtk_unittest.cc', 'browser/password_manager/password_store_default_unittest.cc', 'tools/convert_dict/convert_dict_unittest.cc', '../third_party/hunspell/google/hunspell_tests.cc', @@ -1950,7 +1950,7 @@ '../views/views.gyp:views', ], 'sources!': [ - 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', + 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', ], }, { # else: toolkit_views == 0 'sources/': [ @@ -2134,7 +2134,7 @@ 'browser/first_run/first_run_browsertest.cc', 'browser/geolocation/access_token_store_browsertest.cc', 'browser/geolocation/geolocation_browsertest.cc', - 'browser/gtk/view_id_util_browsertest.cc', + 'browser/ui/gtk/view_id_util_browsertest.cc', 'browser/history/history_browsertest.cc', 'browser/idbbindingutilities_browsertest.cc', 'browser/in_process_webkit/dom_storage_browsertest.cc', @@ -2218,7 +2218,7 @@ ['OS!="linux" or toolkit_views==1', { 'sources!': [ 'browser/extensions/browser_action_test_util_gtk.cc', - 'browser/gtk/view_id_util_browsertest.cc', + 'browser/ui/gtk/view_id_util_browsertest.cc', ], }], ['OS=="win"', { |