diff options
Diffstat (limited to 'chrome/browser')
53 files changed, 222 insertions, 119 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index 1cff5ee..3d43dbb 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -21,9 +21,9 @@ #include "chrome/browser/controller.h" #include "chrome/browser/drag_utils.h" #include "chrome/browser/profile.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" #include "chrome/browser/url_fixer_upper.h" #include "chrome/browser/user_metrics.h" #include "chrome/browser/views/location_bar_view.h" diff --git a/chrome/browser/autocomplete/autocomplete_popup.cc b/chrome/browser/autocomplete/autocomplete_popup.cc index 23535c3..d2437a3 100644 --- a/chrome/browser/autocomplete/autocomplete_popup.cc +++ b/chrome/browser/autocomplete/autocomplete_popup.cc @@ -13,8 +13,8 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/net/dns_global.h" #include "chrome/browser/profile.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/location_bar_view.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc index 9f0eb3e..defb656 100644 --- a/chrome/browser/autocomplete/keyword_provider.cc +++ b/chrome/browser/autocomplete/keyword_provider.cc @@ -8,8 +8,8 @@ #include "base/string_util.h" #include "chrome/browser/profile.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/l10n_util.h" #include "net/base/escape.h" #include "net/base/net_util.h" diff --git a/chrome/browser/autocomplete/keyword_provider_unittest.cc b/chrome/browser/autocomplete/keyword_provider_unittest.cc index e82e8d6..a650701 100644 --- a/chrome/browser/autocomplete/keyword_provider_unittest.cc +++ b/chrome/browser/autocomplete/keyword_provider_unittest.cc @@ -4,8 +4,8 @@ #include "base/message_loop.h" #include "chrome/browser/autocomplete/keyword_provider.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index cd25d13..d302b30 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -9,7 +9,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/google_util.h" #include "chrome/browser/profile.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/url_fixer_upper.h" #include "chrome/common/json_value_serializer.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h index 8fe402f..687ea07 100644 --- a/chrome/browser/autocomplete/search_provider.h +++ b/chrome/browser/autocomplete/search_provider.h @@ -17,7 +17,7 @@ #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/history/history.h" -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/url_fetcher.h" class Profile; diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index e937d99..0eb3d4b 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -115,15 +115,15 @@ if not env.Bit('mac'): 'safe_browsing/safe_browsing_database_bloom.cc', 'safe_browsing/safe_browsing_database_impl.cc', 'safe_browsing/safe_browsing_util.cc', + 'search_engines/template_url.cc', + 'search_engines/template_url_model.cc', + 'search_engines/template_url_parser.cc', 'session_startup_pref.cc', 'sessions/session_command.cc', 'sessions/session_id.cc', 'spellcheck_worditerator.cc', 'spellchecker.cc', 'ssl_error_info.cc', - 'template_url.cc', - 'template_url_model.cc', - 'template_url_parser.cc', 'url_fetcher.cc', 'url_fetcher_protect.cc', 'user_metrics.cc', @@ -259,6 +259,8 @@ if env.Bit('windows'): 'safe_browsing/safe_browsing_blocking_page.cc', 'safe_browsing/safe_browsing_service.cc', 'sandbox_policy.cc', + 'search_engines/template_url_fetcher.cc', + 'search_engines/template_url_prepopulate_data.cc', 'sessions/base_session_service.cc', 'sessions/session_backend.cc', 'sessions/session_restore.cc', @@ -291,8 +293,6 @@ if env.Bit('windows'): 'tabs/tab_strip_model_order_controller.cc', 'task_manager.cc', 'task_manager_resource_providers.cc', - 'template_url_fetcher.cc', - 'template_url_prepopulate_data.cc', 'toolbar_model.cc', 'url_fixer_upper.cc', 'user_data_manager.cc', diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj index 0fca784..cd93d66 100644 --- a/chrome/browser/browser.vcproj +++ b/chrome/browser/browser.vcproj @@ -602,46 +602,6 @@ > </File> <File - RelativePath=".\template_url.cc" - > - </File> - <File - RelativePath=".\template_url.h" - > - </File> - <File - RelativePath=".\template_url_fetcher.cc" - > - </File> - <File - RelativePath=".\template_url_fetcher.h" - > - </File> - <File - RelativePath=".\template_url_model.cc" - > - </File> - <File - RelativePath=".\template_url_model.h" - > - </File> - <File - RelativePath=".\template_url_parser.cc" - > - </File> - <File - RelativePath=".\template_url_parser.h" - > - </File> - <File - RelativePath=".\template_url_prepopulate_data.cc" - > - </File> - <File - RelativePath=".\template_url_prepopulate_data.h" - > - </File> - <File RelativePath=".\url_fetcher.cc" > </File> @@ -2550,6 +2510,140 @@ > </File> </Filter> + <Filter + Name="Search Engines" + > + <File + RelativePath=".\search_engines\template_url.cc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\search_engines\template_url.h" + > + </File> + <File + RelativePath=".\search_engines\template_url_fetcher.cc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\search_engines\template_url_fetcher.h" + > + </File> + <File + RelativePath=".\search_engines\template_url_model.cc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\search_engines\template_url_model.h" + > + </File> + <File + RelativePath=".\search_engines\template_url_parser.cc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\search_engines\template_url_parser.h" + > + </File> + <File + RelativePath=".\search_engines\template_url_prepopulate_data.cc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\search_engines\template_url_prepopulate_data.h" + > + </File> + </Filter> <File RelativePath=".\browser_trial.cc" > diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index abbf875..4f83bac 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -19,7 +19,7 @@ #include "chrome/browser/ssl_manager.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/task_manager.h" -#include "chrome/browser/template_url_prepopulate_data.h" +#include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/browser/views/bookmark_manager_view.h" #include "chrome/browser/views/bookmark_table_view.h" diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc index 86f8e98..e9140b2 100644 --- a/chrome/browser/browsing_data_remover.cc +++ b/chrome/browser/browsing_data_remover.cc @@ -8,9 +8,9 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/profile.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/tab_restore_service.h" -#include "chrome/browser/template_url_model.h" #include "chrome/browser/user_metrics.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index 9b7107a..7bb7d9f 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -18,7 +18,7 @@ #include "chrome/browser/render_view_host.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/user_data_manager.h" #include "chrome/browser/user_metrics.h" #include "chrome/browser/views/keyword_editor_view.h" diff --git a/chrome/browser/dom_ui/new_tab_ui.h b/chrome/browser/dom_ui/new_tab_ui.h index 8f700b2..a8391e8 100644 --- a/chrome/browser/dom_ui/new_tab_ui.h +++ b/chrome/browser/dom_ui/new_tab_ui.h @@ -9,8 +9,8 @@ #include "chrome/browser/dom_ui/dom_ui_host.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/history/history.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/sessions/tab_restore_service.h" -#include "chrome/browser/template_url_model.h" class GURL; class Profile; diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h index dcd5518..0e5a492 100644 --- a/chrome/browser/history/history.h +++ b/chrome/browser/history/history.h @@ -20,7 +20,7 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/browser/history/history_notifications.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" #include "chrome/common/notification_service.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/ref_counted_util.h" diff --git a/chrome/browser/history/url_database.h b/chrome/browser/history/url_database.h index 745c7e3..20aeb78 100644 --- a/chrome/browser/history/url_database.h +++ b/chrome/browser/history/url_database.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" // Temporary until DBCloseScoper moves elsewhere. #include "chrome/common/sqlite_compiled_statement.h" diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index bbc4e6f..b2f61c1 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -11,8 +11,8 @@ #include "base/values.h" #include "chrome/browser/importer/firefox_importer_utils.h" #include "chrome/browser/importer/mork_reader.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_parser.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_parser.h" #include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" #include "generated_resources.h" diff --git a/chrome/browser/importer/firefox_importer_utils.cc b/chrome/browser/importer/firefox_importer_utils.cc index 719ebcc..023fcf9 100644 --- a/chrome/browser/importer/firefox_importer_utils.cc +++ b/chrome/browser/importer/firefox_importer_utils.cc @@ -13,9 +13,9 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/time.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" -#include "chrome/browser/template_url_parser.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" +#include "chrome/browser/search_engines/template_url_parser.h" #include "chrome/common/win_util.h" #include "googleurl/src/gurl.h" #include "net/base/base64.h" diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index 55bed64..d362739 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -19,7 +19,7 @@ #include "base/win_util.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/password_manager/ie7_password.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index dcc1438..52a035d 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -21,7 +21,7 @@ #include "chrome/browser/importer/firefox_profile_lock.h" #include "chrome/browser/importer/ie_importer.h" #include "chrome/browser/importer/toolbar_importer.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/views/importer_lock_view.h" #include "chrome/browser/webdata/web_data_service.h" diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h index df13150..e169eb7 100644 --- a/chrome/browser/importer/importer.h +++ b/chrome/browser/importer/importer.h @@ -19,7 +19,7 @@ #include "chrome/browser/password_manager/ie7_password.h" #endif #include "chrome/browser/profile.h" -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" #include "chrome/common/notification_service.h" #include "googleurl/src/gurl.h" #include "webkit/glue/password_form.h" diff --git a/chrome/browser/metrics_service.cc b/chrome/browser/metrics_service.cc index 7909a0b..bb2ba62 100644 --- a/chrome/browser/metrics_service.cc +++ b/chrome/browser/metrics_service.cc @@ -173,8 +173,8 @@ #include "chrome/browser/plugin_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/render_process_host.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/libxml_utils.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index a849bf1..7d3a947 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -23,12 +23,12 @@ #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/render_process_host.h" +#include "chrome/browser/search_engines/template_url_fetcher.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/spellchecker.h" #include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/template_url_fetcher.h" -#include "chrome/browser/template_url_model.h" #include "chrome/browser/visitedlink_master.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/render_view_context_menu.cc b/chrome/browser/render_view_context_menu.cc index 83082b4..311ba27 100644 --- a/chrome/browser/render_view_context_menu.cc +++ b/chrome/browser/render_view_context_menu.cc @@ -8,8 +8,8 @@ #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/spellchecker.h" -#include "chrome/browser/template_url_model.h" #include "chrome/common/l10n_util.h" #include "webkit/glue/context_node_types.h" diff --git a/chrome/browser/render_view_context_menu_controller.cc b/chrome/browser/render_view_context_menu_controller.cc index 7a75577..bdb34e7 100644 --- a/chrome/browser/render_view_context_menu_controller.cc +++ b/chrome/browser/render_view_context_menu_controller.cc @@ -18,7 +18,7 @@ #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/save_package.h" #include "chrome/browser/profile.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/page_info_window.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc index d65f180..6434fb1 100644 --- a/chrome/browser/rlz/rlz.cc +++ b/chrome/browser/rlz/rlz.cc @@ -19,7 +19,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/env_vars.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/template_url.cc b/chrome/browser/search_engines/template_url.cc index 844ec54..27bfe1d 100644 --- a/chrome/browser/template_url.cc +++ b/chrome/browser/search_engines/template_url.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" #include "base/logging.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/rlz/rlz.h" #include "chrome/browser/google_url_tracker.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/gfx/favicon_size.h" #include "chrome/common/l10n_util.h" #include "net/base/escape.h" diff --git a/chrome/browser/template_url.h b/chrome/browser/search_engines/template_url.h index a675eec..a675eec 100644 --- a/chrome/browser/template_url.h +++ b/chrome/browser/search_engines/template_url.h diff --git a/chrome/browser/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc index 57bb259..5727e2d 100644 --- a/chrome/browser/template_url_fetcher.cc +++ b/chrome/browser/search_engines/template_url_fetcher.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/template_url_fetcher.h" +#include "chrome/browser/search_engines/template_url_fetcher.h" #include "chrome/browser/profile.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" -#include "chrome/browser/template_url_parser.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" +#include "chrome/browser/search_engines/template_url_parser.h" #include "chrome/browser/views/edit_keyword_controller.h" // RequestDelegate ------------------------------------------------------------ diff --git a/chrome/browser/template_url_fetcher.h b/chrome/browser/search_engines/template_url_fetcher.h index a07277f..a07277f 100644 --- a/chrome/browser/template_url_fetcher.h +++ b/chrome/browser/search_engines/template_url_fetcher.h diff --git a/chrome/browser/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc index a3ffd5f..b328964 100644 --- a/chrome/browser/template_url_model.cc +++ b/chrome/browser/search_engines/template_url_model.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url_model.h" #include <algorithm> @@ -14,8 +14,8 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" #include "chrome/browser/rlz/rlz.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_prepopulate_data.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/template_url_model.h b/chrome/browser/search_engines/template_url_model.h index 6b9569b..6b9569b 100644 --- a/chrome/browser/template_url_model.h +++ b/chrome/browser/search_engines/template_url_model.h diff --git a/chrome/browser/template_url_model_unittest.cc b/chrome/browser/search_engines/template_url_model_unittest.cc index b5198e4..9bad770 100644 --- a/chrome/browser/template_url_model_unittest.cc +++ b/chrome/browser/search_engines/template_url_model_unittest.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/pref_service.h" #include "chrome/test/testing_profile.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc index 93f9f79..c3d6c7e 100644 --- a/chrome/browser/template_url_parser.cc +++ b/chrome/browser/search_engines/template_url_parser.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/template_url_parser.h" +#include "chrome/browser/search_engines/template_url_parser.h" #include <map> #include <vector> @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" #include "googleurl/src/gurl.h" #include "libxml/parser.h" #include "libxml/xmlwriter.h" diff --git a/chrome/browser/template_url_parser.h b/chrome/browser/search_engines/template_url_parser.h index facf7c6..facf7c6 100644 --- a/chrome/browser/template_url_parser.h +++ b/chrome/browser/search_engines/template_url_parser.h diff --git a/chrome/browser/template_url_parser_unittest.cc b/chrome/browser/search_engines/template_url_parser_unittest.cc index 381eba0..4cb1fd2 100644 --- a/chrome/browser/template_url_parser_unittest.cc +++ b/chrome/browser/search_engines/template_url_parser_unittest.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/scoped_ptr.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_parser.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_parser.h" #include "chrome/common/chrome_paths.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc index 11ebf21..826787b 100644 --- a/chrome/browser/template_url_prepopulate_data.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/template_url_prepopulate_data.h" +#include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "base/command_line.h" -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/template_url_prepopulate_data.h b/chrome/browser/search_engines/template_url_prepopulate_data.h index 9bc3a70..9bc3a70 100644 --- a/chrome/browser/template_url_prepopulate_data.h +++ b/chrome/browser/search_engines/template_url_prepopulate_data.h diff --git a/chrome/browser/template_url_prepopulate_data_unittest.cc b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc index 14c6abb..09f89d1 100644 --- a/chrome/browser/template_url_prepopulate_data_unittest.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_prepopulate_data.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/scoped_vector.h" #include "chrome/test/testing_profile.h" diff --git a/chrome/browser/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc index d5d745f..f53d2ef 100644 --- a/chrome/browser/template_url_unittest.cc +++ b/chrome/browser/search_engines/template_url_unittest.cc @@ -5,7 +5,7 @@ #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/rlz/rlz.h" -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" #include "testing/gtest/include/gtest/gtest.h" class TemplateURLTest : public testing::Test { diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc index 638d370..c73fc2e 100644 --- a/chrome/browser/tab_contents/web_contents.cc +++ b/chrome/browser/tab_contents/web_contents.cc @@ -30,11 +30,11 @@ #include "chrome/browser/printing/print_job.h" #include "chrome/browser/render_view_host.h" #include "chrome/browser/render_widget_host_view_win.h" // TODO(brettw) delete me. +#include "chrome/browser/search_engines/template_url_fetcher.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/web_contents_view.h" #include "chrome/browser/tab_contents/web_contents_view_win.h" -#include "chrome/browser/template_url_fetcher.h" -#include "chrome/browser/template_url_model.h" #include "chrome/browser/views/hung_renderer_view.h" // TODO(brettw) delete me. #include "chrome/common/chrome_switches.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index 2e42a64..3b0c4bb 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -533,7 +533,7 @@ bool TabStripModel::InternalCloseTabContentsAt(int index, // them. Once they have fired, we'll get a message back saying whether // to proceed closing the page or not, which sends us back to this method // with the HasUnloadListener bit cleared. - WebContents* web_contents = GetContentsAt(index)->AsWebContents(); + WebContents* web_contents = detached_contents->AsWebContents(); // If we hit this code path, the tab had better be a WebContents tab. DCHECK(web_contents); web_contents->render_view_host()->FirePageBeforeUnload(); diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc index b71bf99..2bdd1f2 100644 --- a/chrome/browser/views/clear_browsing_data.cc +++ b/chrome/browser/views/clear_browsing_data.cc @@ -6,7 +6,7 @@ #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/profile.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/background.h" diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index 4eb913f..86f1cd0 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -7,8 +7,8 @@ #include "base/string_util.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/profile.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/url_fixer_upper.h" #include "chrome/browser/user_metrics.h" #include "chrome/browser/views/keyword_editor_view.h" diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index ac6678a..25b01db 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -10,7 +10,7 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/options_window.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index be35283..e4acaa6 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -12,8 +12,8 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/user_metrics.h" #include "chrome/browser/views/edit_keyword_controller.h" #include "chrome/browser/views/standard_layout.h" diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h index 879ed24..c2135a4 100644 --- a/chrome/browser/views/keyword_editor_view.h +++ b/chrome/browser/views/keyword_editor_view.h @@ -9,7 +9,7 @@ #include <map> #include "base/logging.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/views/dialog_delegate.h" #include "chrome/views/native_button.h" #include "chrome/views/table_view.h" diff --git a/chrome/browser/views/keyword_editor_view_unittest.cc b/chrome/browser/views/keyword_editor_view_unittest.cc index 1bbb43c..4d04a07 100644 --- a/chrome/browser/views/keyword_editor_view_unittest.cc +++ b/chrome/browser/views/keyword_editor_view_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/profile.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/keyword_editor_view.h" #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index cad8583..8c727b7 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -13,9 +13,9 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/info_bubble.h" #include "chrome/browser/views/first_run_bubble.h" diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index d506fdc..a7964f6 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -15,10 +15,10 @@ #include "chrome/browser/dom_ui/new_tab_ui.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" -#include "chrome/browser/shell_integration.h" #include "chrome/browser/session_startup_pref.h" -#include "chrome/browser/template_url.h" -#include "chrome/browser/template_url_model.h" +#include "chrome/browser/search_engines/template_url.h" +#include "chrome/browser/search_engines/template_url_model.h" +#include "chrome/browser/shell_integration.h" #include "chrome/browser/url_fixer_upper.h" #include "chrome/browser/views/keyword_editor_view.h" #include "chrome/browser/views/options/options_group_view.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 3232ec4..7791289 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -1470,8 +1470,17 @@ void TabStrip::StartResizeLayoutAnimation() { } void TabStrip::StartInsertTabAnimation(int index) { - // The TabStrip can now use its entire width to lay out Tabs. - available_width_for_tabs_ = -1; + // Don't shock users by letting all tabs move when they are focused + // on the tab-strip. Wait for later, when they aren't looking. + int last_tab_index = GetTabCount() - 2; + if (last_tab_index > 0) { + Tab* last_tab = GetTabAt(last_tab_index); + available_width_for_tabs_ = std::min( + GetAvailableWidthForTabs(last_tab) + last_tab->width(), + width() - (kNewTabButtonHOffset + newtab_button_size_.width())); + } else { + available_width_for_tabs_ = -1; + } if (active_animation_.get()) active_animation_->Stop(); active_animation_.reset(new InsertTabAnimation(this, index)); diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc index d736ac4..a3f8e55 100644 --- a/chrome/browser/webdata/web_data_service.cc +++ b/chrome/browser/webdata/web_data_service.cc @@ -10,7 +10,7 @@ #include "base/path_service.h" #include "base/scoped_ptr.h" #include "chrome/browser/password_manager/ie7_password.h" -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" #include "chrome/common/chrome_constants.h" #include "webkit/glue/password_form.h" #include "webkit/glue/autofill_form.h" diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc index 5998282..af78244 100644 --- a/chrome/browser/webdata/web_database.cc +++ b/chrome/browser/webdata/web_database.cc @@ -15,7 +15,7 @@ #include "base/values.h" #include "chrome/browser/history/history_database.h" #include "chrome/browser/password_manager/encryptor.h" -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" #include "chrome/common/l10n_util.h" #include "chrome/common/scoped_vector.h" #include "webkit/glue/password_form.h" diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h index 19059ee..54ec840 100644 --- a/chrome/browser/webdata/web_database.h +++ b/chrome/browser/webdata/web_database.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "chrome/browser/meta_table_helper.h" -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" #include "chrome/common/sqlite_utils.h" #include "skia/include/SkBitmap.h" #include "webkit/glue/autofill_form.h" diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc index 349b803..8842e40 100644 --- a/chrome/browser/webdata/web_database_unittest.cc +++ b/chrome/browser/webdata/web_database_unittest.cc @@ -7,7 +7,7 @@ #include "base/string_util.h" #include "base/time.h" #include "base/values.h" -#include "chrome/browser/template_url.h" +#include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/webdata/web_database.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/stl_util-inl.h" |