diff options
Diffstat (limited to 'chrome/browser')
53 files changed, 109 insertions, 109 deletions
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj index b0511f1..31ce6d6 100644 --- a/chrome/browser/browser.vcproj +++ b/chrome/browser/browser.vcproj @@ -2055,14 +2055,6 @@ > </File> <File - RelativePath=".\external_protocol_dialog.cc" - > - </File> - <File - RelativePath=".\external_protocol_dialog.h" - > - </File> - <File RelativePath=".\external_protocol_handler.cc" > </File> @@ -2087,14 +2079,6 @@ > </File> <File - RelativePath=".\views\html_dialog_view.cc" - > - </File> - <File - RelativePath=".\views\html_dialog_view.h" - > - </File> - <File RelativePath=".\interstitial_page_delegate.h" > </File> @@ -2107,14 +2091,6 @@ > </File> <File - RelativePath=".\page_info_window.cc" - > - </File> - <File - RelativePath=".\page_info_window.h" - > - </File> - <File RelativePath=".\page_state.cc" > </File> @@ -2131,14 +2107,6 @@ > </File> <File - RelativePath=".\views\restart_message_box.cc" - > - </File> - <File - RelativePath=".\views\restart_message_box.h" - > - </File> - <File RelativePath=".\ssl_blocking_page.cc" > </File> @@ -2147,10 +2115,6 @@ > </File> <File - RelativePath=".\standard_layout.h" - > - </File> - <File RelativePath=".\suspend_controller.cc" > </File> @@ -2159,14 +2123,6 @@ > </File> <File - RelativePath=".\tab_contents_container_view.cc" - > - </File> - <File - RelativePath=".\tab_contents_container_view.h" - > - </File> - <File RelativePath=".\toolbar_model.cc" > </File> @@ -2174,14 +2130,6 @@ RelativePath=".\toolbar_model.h" > </File> - <File - RelativePath=".\user_data_dir_dialog.cc" - > - </File> - <File - RelativePath=".\user_data_dir_dialog.h" - > - </File> </Files> <Globals> </Globals> diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index e574ef8a..67bc255 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -35,8 +35,8 @@ #include "chrome/browser/rlz/rlz.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/url_fixer_upper.h" -#include "chrome/browser/user_data_dir_dialog.h" #include "chrome/browser/user_metrics.h" +#include "chrome/browser/views/user_data_dir_dialog.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index 80f8571..886a25e 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -12,7 +12,6 @@ #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/google_url_tracker.h" #include "chrome/browser/metrics_service.h" -#include "chrome/browser/page_info_window.h" #include "chrome/browser/password_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/session_startup_pref.h" @@ -23,6 +22,7 @@ #include "chrome/browser/template_url_prepopulate_data.h" #include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/browser/views/keyword_editor_view.h" +#include "chrome/browser/views/page_info_window.h" #include "chrome/browser/web_contents.h" namespace browser { diff --git a/chrome/browser/external_protocol_handler.cc b/chrome/browser/external_protocol_handler.cc index 3860f5f..24423ac 100644 --- a/chrome/browser/external_protocol_handler.cc +++ b/chrome/browser/external_protocol_handler.cc @@ -14,7 +14,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process_impl.h" -#include "chrome/browser/external_protocol_dialog.h" +#include "chrome/browser/views/external_protocol_dialog.h" #include "chrome/common/pref_service.h" #include "chrome/common/pref_names.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc index 82253dc..50f5123 100644 --- a/chrome/browser/external_tab_container.cc +++ b/chrome/browser/external_tab_container.cc @@ -9,7 +9,7 @@ #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents.h" -#include "chrome/browser/tab_contents_container_view.h" +#include "chrome/browser/views/tab_contents_container_view.h" #include "chrome/browser/web_contents.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/ssl_manager.cc b/chrome/browser/ssl_manager.cc index 77b8c12..bc4e957 100644 --- a/chrome/browser/ssl_manager.cc +++ b/chrome/browser/ssl_manager.cc @@ -17,11 +17,11 @@ #include "chrome/browser/resource_request_details.h" #include "chrome/browser/ssl_error_info.h" #include "chrome/browser/ssl_policy.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/tab_contents.h" #include "chrome/browser/tab_util.h" #include "chrome/browser/web_contents.h" #include "chrome/browser/views/info_bar_view.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc index 5d9b8f0..8d06476 100644 --- a/chrome/browser/task_manager.cc +++ b/chrome/browser/task_manager.cc @@ -10,9 +10,9 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/render_process_host.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/task_manager_resource_providers.h" #include "chrome/browser/tab_util.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index 6766a9b..02eb5ce 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -12,9 +12,9 @@ #include "chrome/app/locales/locale_settings.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/common/gfx/color_utils.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/user_metrics.h" #include "chrome/browser/views/restart_message_box.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index 476391e..12dd987 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -8,10 +8,10 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/profile.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/user_metrics.h" #include "chrome/browser/views/bookmark_editor_view.h" #include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc index 549474c..2d777b3 100644 --- a/chrome/browser/views/bookmark_editor_view.cc +++ b/chrome/browser/views/bookmark_editor_view.cc @@ -10,8 +10,8 @@ #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/url_fixer_upper.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/background.h" #include "chrome/views/focus_manager.h" diff --git a/chrome/browser/views/browser_views.vcproj b/chrome/browser/views/browser_views.vcproj index 15054b5..6a36ee7 100644 --- a/chrome/browser/views/browser_views.vcproj +++ b/chrome/browser/views/browser_views.vcproj @@ -562,6 +562,14 @@ > </File> <File + RelativePath=".\external_protocol_dialog.cc" + > + </File> + <File + RelativePath=".\external_protocol_dialog.h" + > + </File> + <File RelativePath=".\first_run_bubble.cc" > </File> @@ -602,6 +610,14 @@ > </File> <File + RelativePath=".\html_dialog_view.cc" + > + </File> + <File + RelativePath=".\html_dialog_view.h" + > + </File> + <File RelativePath=".\hung_renderer_view.cc" > </File> @@ -682,6 +698,14 @@ > </File> <File + RelativePath=".\page_info_window.cc" + > + </File> + <File + RelativePath=".\page_info_window.h" + > + </File> + <File RelativePath=".\password_manager_view.cc" > </File> @@ -714,6 +738,14 @@ > </File> <File + RelativePath=".\restart_message_box.cc" + > + </File> + <File + RelativePath=".\restart_message_box.h" + > + </File> + <File RelativePath=".\sad_tab_view.cc" > </File> @@ -734,6 +766,10 @@ > </File> <File + RelativePath=".\standard_layout.h" + > + </File> + <File RelativePath=".\star_toggle.cc" > </File> @@ -750,6 +786,14 @@ > </File> <File + RelativePath=".\tab_contents_container_view.cc" + > + </File> + <File + RelativePath=".\tab_contents_container_view.h" + > + </File> + <File RelativePath=".\theme_helpers.cc" > </File> @@ -774,6 +818,14 @@ > </File> <File + RelativePath=".\user_data_dir_dialog.cc" + > + </File> + <File + RelativePath=".\user_data_dir_dialog.h" + > + </File> + <File RelativePath=".\window_resources.cc" > </File> diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc index cbc592c..b1dfacb 100644 --- a/chrome/browser/views/bug_report_view.cc +++ b/chrome/browser/views/bug_report_view.cc @@ -15,7 +15,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_util.h" #include "chrome/browser/tab_contents.h" #include "chrome/browser/url_fetcher.h" -#include "chrome/browser/standard_layout.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc index c8e3ea6..c81b63d 100644 --- a/chrome/browser/views/clear_browsing_data.cc +++ b/chrome/browser/views/clear_browsing_data.cc @@ -6,8 +6,8 @@ #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/profile.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/template_url_model.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/background.h" #include "chrome/views/checkbox.h" diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index 63cffaa..ba9fcbb 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -7,12 +7,12 @@ #include "base/string_util.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/profile.h" -#include "chrome/browser/standard_layout.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/keyword_editor_view.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/label.h" diff --git a/chrome/browser/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc index d3834b5..cc85b0e 100644 --- a/chrome/browser/external_protocol_dialog.cc +++ b/chrome/browser/views/external_protocol_dialog.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/external_protocol_dialog.h" +#include "chrome/browser/views/external_protocol_dialog.h" #include "base/registry.h" #include "base/string_util.h" diff --git a/chrome/browser/external_protocol_dialog.h b/chrome/browser/views/external_protocol_dialog.h index 0c48e34..0c48e34 100644 --- a/chrome/browser/external_protocol_dialog.h +++ b/chrome/browser/views/external_protocol_dialog.h diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index 0221814..6696e55 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -9,8 +9,8 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/options_window.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/template_url_model.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/event.h" diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc index d5c91351..1109ac9 100644 --- a/chrome/browser/views/first_run_customize_view.cc +++ b/chrome/browser/views/first_run_customize_view.cc @@ -9,8 +9,8 @@ #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/shell_integration.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/user_metrics.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/checkbox.h" diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc index e4fc454..9e581e3 100644 --- a/chrome/browser/views/first_run_view.cc +++ b/chrome/browser/views/first_run_view.cc @@ -8,8 +8,8 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/views/first_run_customize_view.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/browser/user_metrics.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc index fcb5cce..e6aa69d 100644 --- a/chrome/browser/views/first_run_view_base.cc +++ b/chrome/browser/views/first_run_view_base.cc @@ -11,8 +11,8 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/first_run.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/frame/browser_view2.cc b/chrome/browser/views/frame/browser_view2.cc index af274ff..e72ec22 100644 --- a/chrome/browser/views/frame/browser_view2.cc +++ b/chrome/browser/views/frame/browser_view2.cc @@ -10,12 +10,12 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/encoding_menu_controller_delegate.h" -#include "chrome/browser/tab_contents_container_view.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/browser/views/download_shelf_view.h" #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/browser/views/status_bubble.h" +#include "chrome/browser/views/tab_contents_container_view.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/browser/views/toolbar_view.h" #include "chrome/common/drag_drop_types.h" diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index fa1691d..8138cc6 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -8,7 +8,7 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/render_view_host.h" -#include "chrome/browser/standard_layout.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/browser/web_contents.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/gfx/chrome_canvas.h" diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc index dc1c36b..2b8dc58 100644 --- a/chrome/browser/views/importer_lock_view.cc +++ b/chrome/browser/views/importer_lock_view.cc @@ -6,7 +6,7 @@ #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/importer/importer.h" -#include "chrome/browser/standard_layout.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/label.h" #include "chrome/views/window.h" diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc index afa8eb2..b8ee784 100644 --- a/chrome/browser/views/importer_view.cc +++ b/chrome/browser/views/importer_view.cc @@ -6,7 +6,7 @@ #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/standard_layout.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/checkbox.h" #include "chrome/views/grid_layout.h" diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc index 8dbc8ec..77f842f 100644 --- a/chrome/browser/views/importing_progress_view.cc +++ b/chrome/browser/views/importing_progress_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/importing_progress_view.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/browser/standard_layout.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" diff --git a/chrome/browser/views/info_bar_alternate_nav_url_view.cc b/chrome/browser/views/info_bar_alternate_nav_url_view.cc index 7237914..24477f3 100644 --- a/chrome/browser/views/info_bar_alternate_nav_url_view.cc +++ b/chrome/browser/views/info_bar_alternate_nav_url_view.cc @@ -5,10 +5,10 @@ #include "chrome/browser/views/info_bar_alternate_nav_url_view.h" #include "chrome/app/theme/theme_resources.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/web_contents.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/info_bar_view.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/info_bar_confirm_view.cc b/chrome/browser/views/info_bar_confirm_view.cc index 7a4728a..57ffc53 100644 --- a/chrome/browser/views/info_bar_confirm_view.cc +++ b/chrome/browser/views/info_bar_confirm_view.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/standard_layout.h" #include "chrome/browser/views/info_bar_confirm_view.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "generated_resources.h" diff --git a/chrome/browser/views/info_bar_item_view.cc b/chrome/browser/views/info_bar_item_view.cc index 0d111d0..d5b7411 100644 --- a/chrome/browser/views/info_bar_item_view.cc +++ b/chrome/browser/views/info_bar_item_view.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/app/theme/theme_resources.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/views/info_bar_item_view.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/external_focus_tracker.h" diff --git a/chrome/browser/views/input_window.cc b/chrome/browser/views/input_window.cc index c7d9698..77d7901 100644 --- a/chrome/browser/views/input_window.cc +++ b/chrome/browser/views/input_window.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/input_window.h" -#include "chrome/browser/standard_layout.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index 3532d86..a4e446d 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -12,11 +12,11 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/template_url.h" #include "chrome/browser/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" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index ce9da67..d5eba49 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -13,13 +13,13 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/navigation_entry.h" -#include "chrome/browser/page_info_window.h" #include "chrome/browser/profile.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" +#include "chrome/browser/views/page_info_window.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/gfx/chrome_canvas.h" diff --git a/chrome/browser/views/login_view.cc b/chrome/browser/views/login_view.cc index bb5eb86..ccbad1f 100644 --- a/chrome/browser/views/login_view.cc +++ b/chrome/browser/views/login_view.cc @@ -7,7 +7,7 @@ #include "chrome/browser/views/login_view.h" #include "base/message_loop.h" -#include "chrome/browser/standard_layout.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" diff --git a/chrome/browser/views/old_frames/simple_vista_frame.cc b/chrome/browser/views/old_frames/simple_vista_frame.cc index fc25e6a..c7090d7 100644 --- a/chrome/browser/views/old_frames/simple_vista_frame.cc +++ b/chrome/browser/views/old_frames/simple_vista_frame.cc @@ -8,7 +8,7 @@ #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents.h" -#include "chrome/browser/tab_contents_container_view.h" +#include "chrome/browser/views/tab_contents_container_view.h" #include "chrome/browser/web_app.h" #include "chrome/browser/web_app_icon_manager.h" #include "chrome/browser/web_contents.h" diff --git a/chrome/browser/views/old_frames/simple_xp_frame.cc b/chrome/browser/views/old_frames/simple_xp_frame.cc index 4c4d506..d4bf51a 100644 --- a/chrome/browser/views/old_frames/simple_xp_frame.cc +++ b/chrome/browser/views/old_frames/simple_xp_frame.cc @@ -9,8 +9,8 @@ #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents.h" -#include "chrome/browser/tab_contents_container_view.h" #include "chrome/browser/views/location_bar_view.h" +#include "chrome/browser/views/tab_contents_container_view.h" #include "chrome/browser/views/tabs/tab.h" #include "chrome/browser/web_app.h" #include "chrome/browser/web_app_icon_manager.h" diff --git a/chrome/browser/views/old_frames/vista_frame.cc b/chrome/browser/views/old_frames/vista_frame.cc index faa1213..ef531c0 100644 --- a/chrome/browser/views/old_frames/vista_frame.cc +++ b/chrome/browser/views/old_frames/vista_frame.cc @@ -20,11 +20,11 @@ #include "chrome/browser/frame_util.h" #include "chrome/browser/suspend_controller.h" #include "chrome/browser/tab_contents.h" -#include "chrome/browser/tab_contents_container_view.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/browser/views/download_shelf_view.h" #include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/views/tab_contents_container_view.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/gfx/chrome_canvas.h" diff --git a/chrome/browser/views/old_frames/xp_frame.cc b/chrome/browser/views/old_frames/xp_frame.cc index 6a33d77..1a02f3a 100644 --- a/chrome/browser/views/old_frames/xp_frame.cc +++ b/chrome/browser/views/old_frames/xp_frame.cc @@ -15,13 +15,13 @@ #include "chrome/browser/frame_util.h" #include "chrome/browser/suspend_controller.h" #include "chrome/browser/tab_contents.h" -#include "chrome/browser/tab_contents_container_view.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/browser/views/download_shelf_view.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/old_frames/point_buffer.h" +#include "chrome/browser/views/tab_contents_container_view.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index 569ca31..fe00d42 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -25,10 +25,10 @@ #include "chrome/browser/net/dns_global.h" #include "chrome/browser/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "chrome/browser/standard_layout.h" -#include "chrome/browser/views/restart_message_box.h" #include "chrome/browser/views/options/cookies_view.h" #include "chrome/browser/views/options/language_combobox_model.h" +#include "chrome/browser/views/restart_message_box.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/filter_policy.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/pref_member.h" diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc index 3476134..2865882 100644 --- a/chrome/browser/views/options/advanced_page_view.cc +++ b/chrome/browser/views/options/advanced_page_view.cc @@ -7,8 +7,8 @@ #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/views/options/advanced_contents_view.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index b5d01dd..d138840a 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -15,10 +15,10 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/views/options/fonts_languages_window_view.h" #include "chrome/browser/views/options/options_group_view.h" #include "chrome/browser/views/password_manager_view.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index 564fd83..5ba17fd 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -10,8 +10,8 @@ #include "base/time_format.h" #include "chrome/app/locales/locale_settings.h" #include "chrome/app/theme/theme_resources.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/profile.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/color_utils.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index 09a82cf..0d9c559b 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -17,8 +17,8 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/views/password_manager_view.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index a231872..6f178ef 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -17,12 +17,12 @@ #include "chrome/browser/profile.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/session_startup_pref.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/template_url.h" #include "chrome/browser/template_url_model.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" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 485e35b..aa0e3b3 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -16,10 +16,10 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/views/options/language_combobox_model.h" #include "chrome/browser/views/password_manager_view.h" #include "chrome/browser/views/restart_message_box.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc index 1046f75..d905d2b 100644 --- a/chrome/browser/views/options/options_group_view.cc +++ b/chrome/browser/views/options/options_group_view.cc @@ -10,7 +10,7 @@ #include "base/gfx/native_theme.h" #include "base/gfx/skia_utils.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/browser/standard_layout.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/page_info_window.cc b/chrome/browser/views/page_info_window.cc index f136b65..2d80ded 100644 --- a/chrome/browser/page_info_window.cc +++ b/chrome/browser/views/page_info_window.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/page_info_window.h" +#include "chrome/browser/views/page_info_window.h" #include <cryptuiapi.h> #pragma comment(lib, "cryptui.lib") @@ -16,8 +16,8 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/navigation_entry.h" #include "chrome/browser/profile.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/ssl_manager.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/page_info_window.h b/chrome/browser/views/page_info_window.h index 363cb1b..f2e998c 100644 --- a/chrome/browser/page_info_window.h +++ b/chrome/browser/views/page_info_window.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PAGE_INFO_WINDOW_H__ -#define CHROME_BROWSER_PAGE_INFO_WINDOW_H__ +#ifndef CHROME_BROWSER_VIEWS_PAGE_INFO_WINDOW_H__ +#define CHROME_BROWSER_VIEWS_PAGE_INFO_WINDOW_H__ #include "chrome/views/dialog_delegate.h" #include "chrome/views/native_button.h" @@ -89,4 +89,4 @@ class PageInfoWindow : public ChromeViews::DialogDelegate, DISALLOW_EVIL_CONSTRUCTORS(PageInfoWindow); }; -#endif // #define CHROME_BROWSER_PAGE_INFO_WINDOW_H__ +#endif // #define CHROME_BROWSER_VIEWS_PAGE_INFO_WINDOW_H__ diff --git a/chrome/browser/views/password_manager_view.cc b/chrome/browser/views/password_manager_view.cc index cee8b3d..678b036 100644 --- a/chrome/browser/views/password_manager_view.cc +++ b/chrome/browser/views/password_manager_view.cc @@ -5,8 +5,8 @@ #include "base/string_util.h" #include "chrome/common/l10n_util.h" #include "chrome/browser/profile.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/views/password_manager_view.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/views/background.h" #include "chrome/views/grid_layout.h" #include "chrome/views/native_button.h" diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index 8566cdb..f08ccb3 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -9,9 +9,9 @@ #include "chrome/app/locales/locale_settings.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/profile.h" -#include "chrome/browser/standard_layout.h" #include "chrome/browser/tab_contents.h" #include "chrome/browser/url_fixer_upper.h" +#include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/url_elider.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/standard_layout.h b/chrome/browser/views/standard_layout.h index 22ff8c5..37e239bc 100644 --- a/chrome/browser/standard_layout.h +++ b/chrome/browser/views/standard_layout.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_STANDARD_LAYOUT_H__ -#define CHROME_BROWSER_STANDARD_LAYOUT_H__ +#ifndef CHROME_BROWSER_VIEWS_STANDARD_LAYOUT_H__ +#define CHROME_BROWSER_VIEWS_STANDARD_LAYOUT_H__ #include "chrome/views/grid_layout.h" @@ -74,5 +74,5 @@ static ChromeViews::GridLayout* CreatePanelGridLayout(ChromeViews::View* host) { return layout; } -#endif // CHROME_BROWSER_STANDARD_LAYOUT_H__ +#endif // CHROME_BROWSER_VIEWS_STANDARD_LAYOUT_H__ diff --git a/chrome/browser/tab_contents_container_view.cc b/chrome/browser/views/tab_contents_container_view.cc index 404a391..582726a 100644 --- a/chrome/browser/tab_contents_container_view.cc +++ b/chrome/browser/views/tab_contents_container_view.cc @@ -4,7 +4,7 @@ #include <algorithm> -#include "chrome/browser/tab_contents_container_view.h" +#include "chrome/browser/views/tab_contents_container_view.h" #include "base/logging.h" #include "chrome/browser/render_view_host.h" diff --git a/chrome/browser/tab_contents_container_view.h b/chrome/browser/views/tab_contents_container_view.h index 0a4315e..c904b73 100644 --- a/chrome/browser/tab_contents_container_view.h +++ b/chrome/browser/views/tab_contents_container_view.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_VIEWS_TAB_CONTENTS_CONTAINER_VIEW_H__ -#define CHROME_VIEWS_TAB_CONTENTS_CONTAINER_VIEW_H__ +#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_CONTAINER_VIEW_H__ +#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_CONTAINER_VIEW_H__ namespace ChromeView { class KeyEvent; @@ -77,4 +77,4 @@ class TabContentsContainerView : public ChromeViews::HWNDView, DISALLOW_EVIL_CONSTRUCTORS(TabContentsContainerView); }; -#endif // #ifndef CHROME_VIEWS_TAB_CONTENTS_CONTAINER_VIEW_H__ +#endif // #ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_CONTAINER_VIEW_H__ diff --git a/chrome/browser/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc index 840750e..90460fb 100644 --- a/chrome/browser/user_data_dir_dialog.cc +++ b/chrome/browser/views/user_data_dir_dialog.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" -#include "chrome/browser/user_data_dir_dialog.h" +#include "chrome/browser/views/user_data_dir_dialog.h" #include "chrome/common/l10n_util.h" #include "chrome/views/message_box_view.h" #include "chrome/views/window.h" diff --git a/chrome/browser/user_data_dir_dialog.h b/chrome/browser/views/user_data_dir_dialog.h index d9811a8..d9811a8 100644 --- a/chrome/browser/user_data_dir_dialog.h +++ b/chrome/browser/views/user_data_dir_dialog.h |