diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 23:48:54 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 23:48:54 +0000 |
| commit | 9e790bdb7aabd7849243158d7095fb79dc26262c (patch) | |
| tree | 2d41c8b2c0b79e19a686927e2c5d89849872de13 /chrome | |
| parent | 5d6fe75abc0414d83319ce7668d7245b05e424b5 (diff) | |
| download | chromium_src-9e790bdb7aabd7849243158d7095fb79dc26262c.zip chromium_src-9e790bdb7aabd7849243158d7095fb79dc26262c.tar.gz chromium_src-9e790bdb7aabd7849243158d7095fb79dc26262c.tar.bz2 | |
Remove the stubbed out headers in chrome/browser/views.
Update references to use headers in chrome/browser/ui/views.
Update copyright dates in affected files.
/chrome/browser/ui/views/constrained_html_delegate_win.cc
Add space before 'private' label (presubmit warning)
/chrome/browser/ui/views/toolbar_view.cc
Add space before 'cleanup' label (presubmit warning)
BUG=69082
TEST=Compiling...
Review URL: http://codereview.chromium.org/6204002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
498 files changed, 836 insertions, 3071 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index fa32d13..f262ef4 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -40,7 +40,7 @@ #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/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/common/notification_service.h" #include "googleurl/src/url_util.h" #include "gfx/canvas.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.h b/chrome/browser/autocomplete/autocomplete_edit_view_win.h index 7fc56a9..4cfa4dc 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,7 +19,7 @@ #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" -#include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" +#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" #include "chrome/common/page_transition_types.h" #include "gfx/font.h" #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/autofill/autofill_cc_infobar_win.cc b/chrome/browser/autofill/autofill_cc_infobar_win.cc index 31a7c6a..80595b3 100644 --- a/chrome/browser/autofill/autofill_cc_infobar_win.cc +++ b/chrome/browser/autofill/autofill_cc_infobar_win.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/autofill/autofill_cc_infobar.h" #include "app/resource_bundle.h" -#include "chrome/browser/views/event_utils.h" -#include "chrome/browser/views/infobars/infobars.h" -#include "chrome/browser/views/infobars/infobar_text_button.h" +#include "chrome/browser/ui/views/event_utils.h" +#include "chrome/browser/ui/views/infobars/infobars.h" +#include "chrome/browser/ui/views/infobars/infobar_text_button.h" #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc index 0ad5400..a2d142a 100644 --- a/chrome/browser/automation/automation_provider_win.cc +++ b/chrome/browser/automation/automation_provider_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -21,7 +21,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/bookmark_bar_view.h" +#include "chrome/browser/ui/views/bookmark_bar_view.h" #include "chrome/common/automation_messages.h" #include "chrome/common/page_zoom.h" #include "views/focus/accelerator_handler.h" diff --git a/chrome/browser/automation/testing_automation_provider_views.cc b/chrome/browser/automation/testing_automation_provider_views.cc index f8631cf..4604ce9 100644 --- a/chrome/browser/automation/testing_automation_provider_views.cc +++ b/chrome/browser/automation/testing_automation_provider_views.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,8 +7,8 @@ #include "chrome/browser/automation/automation_browser_tracker.h" #include "chrome/browser/automation/automation_window_tracker.h" #include "chrome/browser/browser_window.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/toolbar_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar_view.h" #include "chrome/common/automation_messages.h" #include "gfx/point.h" #include "views/controls/menu/menu_wrapper.h" diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc index 311237f..9bc31bf 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -18,7 +18,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_WIN) -#include "chrome/browser/views/bookmark_bar_view.h" +#include "chrome/browser/ui/views/bookmark_bar_view.h" #endif // PageNavigator implementation that records the URL. diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 3de80ac..db17554 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -65,7 +65,7 @@ #if defined(OS_WIN) #include "chrome/browser/enumerate_modules_model_win.h" -#include "chrome/browser/views/about_ipc_dialog.h" +#include "chrome/browser/ui/views/about_ipc_dialog.h" #elif defined(OS_CHROMEOS) #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index b8dc0e7..abf7614 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -33,9 +33,9 @@ #endif #if defined(TOOLKIT_VIEWS) -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" -#include "chrome/browser/views/tab_contents/tab_contents_container.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" #endif #if defined(TOOLKIT_USES_GTK) diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 6b12dfc..961f783 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -134,7 +134,7 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/rlz/rlz.h" -#include "chrome/browser/views/user_data_dir_dialog.h" +#include "chrome/browser/ui/views/user_data_dir_dialog.h" #include "chrome/common/sandbox_policy.h" #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" @@ -152,7 +152,7 @@ #endif #if defined(TOOLKIT_VIEWS) -#include "chrome/browser/views/chrome_views_delegate.h" +#include "chrome/browser/ui/views/chrome_views_delegate.h" #include "views/focus/accelerator_handler.h" #endif @@ -166,7 +166,7 @@ #include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/metrics_cros_settings_provider.h" -#include "chrome/browser/views/browser_dialogs.h" +#include "chrome/browser/ui/views/browser_dialogs.h" #endif #if defined(TOOLKIT_USES_GTK) diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index 2c763c7..cf8a36e 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -24,7 +24,7 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/metrics/metrics_service.h" -#include "chrome/browser/views/uninstall_view.h" +#include "chrome/browser/ui/views/uninstall_view.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/env_vars.h" #include "chrome/common/main_function_params.h" diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc index a6b280d..521852f 100644 --- a/chrome/browser/chromeos/external_protocol_dialog.cc +++ b/chrome/browser/chromeos/external_protocol_dialog.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,7 +14,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/window.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/frame/browser_frame_chromeos.h b/chrome/browser/chromeos/frame/browser_frame_chromeos.h index 9f72260..b1fe5e4 100644 --- a/chrome/browser/chromeos/frame/browser_frame_chromeos.h +++ b/chrome/browser/chromeos/frame/browser_frame_chromeos.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_FRAME_CHROMEOS_H_ #pragma once -#include "chrome/browser/views/frame/browser_frame_gtk.h" +#include "chrome/browser/ui/views/frame/browser_frame_gtk.h" namespace chromeos { diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc index 870a4f6..fb47a8d 100644 --- a/chrome/browser/chromeos/frame/browser_view.cc +++ b/chrome/browser/chromeos/frame/browser_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,13 +19,13 @@ #include "chrome/browser/chromeos/view_ids.h" #include "chrome/browser/chromeos/wm_ipc.h" #include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/views/frame/browser_frame_gtk.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/frame/browser_view_layout.h" -#include "chrome/browser/views/tabs/tab.h" -#include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/browser/views/theme_background.h" -#include "chrome/browser/views/toolbar_view.h" +#include "chrome/browser/ui/views/frame/browser_frame_gtk.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view_layout.h" +#include "chrome/browser/ui/views/tabs/tab.h" +#include "chrome/browser/ui/views/tabs/tab_strip.h" +#include "chrome/browser/ui/views/theme_background.h" +#include "chrome/browser/ui/views/toolbar_view.h" #include "chrome/common/chrome_switches.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/frame/browser_view.h b/chrome/browser/chromeos/frame/browser_view.h index a99d17c..e4848e2 100644 --- a/chrome/browser/chromeos/frame/browser_view.h +++ b/chrome/browser/chromeos/frame/browser_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include <vector> #include "chrome/browser/chromeos/status/status_area_host.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "views/controls/menu/menu_wrapper.h" class AccessibleToolbarView; diff --git a/chrome/browser/chromeos/frame/bubble_frame_view.cc b/chrome/browser/chromeos/frame/bubble_frame_view.cc index f185159..d12206d 100644 --- a/chrome/browser/chromeos/frame/bubble_frame_view.cc +++ b/chrome/browser/chromeos/frame/bubble_frame_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,7 +12,7 @@ #include "gfx/rect.h" #include "chrome/browser/chromeos/frame/bubble_window.h" #include "chrome/browser/chromeos/login/helper.h" -#include "chrome/browser/views/bubble_border.h" +#include "chrome/browser/ui/views/bubble_border.h" #include "grit/theme_resources.h" #include "views/controls/button/image_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/frame/panel_browser_view.h b/chrome/browser/chromeos/frame/panel_browser_view.h index a3f3245..23ba79c 100644 --- a/chrome/browser/chromeos/frame/panel_browser_view.h +++ b/chrome/browser/chromeos/frame/panel_browser_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include "app/x11_util.h" #include "base/scoped_ptr.h" #include "chrome/browser/chromeos/frame/panel_controller.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" class Browser; @@ -18,7 +18,7 @@ namespace chromeos { class PanelController; // A browser view that implements Panel specific behavior. -// NOTE: This inherits from ::BrowserView in chrome/browser/views/frame/, +// NOTE: This inherits from ::BrowserView in chrome/browser/ui/views/frame/, // not chromeos::BrowserView in chrome/browser/chromeos/frame/. class PanelBrowserView : public ::BrowserView, public PanelController::Delegate { diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc index 9ce54f6..dff4675 100644 --- a/chrome/browser/chromeos/login/background_view.cc +++ b/chrome/browser/chromeos/login/background_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -26,7 +26,7 @@ #include "chrome/browser/chromeos/status/status_area_view.h" #include "chrome/browser/chromeos/wm_ipc.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/views/dom_view.h" +#include "chrome/browser/ui/views/dom_view.h" #include "gfx/gtk_util.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc index c23a89a..12e36d3 100644 --- a/chrome/browser/chromeos/login/eula_view.cc +++ b/chrome/browser/chromeos/login/eula_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -28,8 +28,8 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/dom_view.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/dom_view.h" +#include "chrome/browser/ui/views/window.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/url_constants.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 1b906e0..28a2fef 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -31,7 +31,7 @@ #include "chrome/browser/chromeos/view_ids.h" #include "chrome/browser/chromeos/wm_ipc.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/window.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/net/gaia/google_service_auth_error.h" #include "gfx/native_widget_types.h" diff --git a/chrome/browser/chromeos/login/message_bubble.h b/chrome/browser/chromeos/login/message_bubble.h index f29ecf8..6ef33bc 100644 --- a/chrome/browser/chromeos/login/message_bubble.h +++ b/chrome/browser/chromeos/login/message_bubble.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_MESSAGE_BUBBLE_H_ #pragma once -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" #include "views/controls/button/button.h" #include "views/controls/link.h" #include "views/view.h" diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc index 0b7023b..2488b36 100644 --- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,7 +15,7 @@ #include "chrome/browser/chromeos/login/screen_locker_tester.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/browser_dialogs.h" +#include "chrome/browser/ui/views/browser_dialogs.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/chromeos/login/web_page_view.h b/chrome/browser/chromeos/login/web_page_view.h index e219722..dc1bdb8 100644 --- a/chrome/browser/chromeos/login/web_page_view.h +++ b/chrome/browser/chromeos/login/web_page_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,7 +10,7 @@ #include "base/timer.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/dom_view.h" +#include "chrome/browser/ui/views/dom_view.h" #include "views/view.h" class Profile; diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.h b/chrome/browser/chromeos/login/wizard_accessibility_helper.h index c27ef3c..76c151a 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_helper.h +++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,7 +13,7 @@ #include "base/scoped_ptr.h" #include "base/singleton.h" #include "chrome/browser/chromeos/login/wizard_accessibility_handler.h" -#include "chrome/browser/views/accessible_view_helper.h" +#include "chrome/browser/ui/views/accessible_view_helper.h" #include "chrome/common/notification_registrar.h" class Profile; diff --git a/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc b/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc index e18ba3a..98d864d 100644 --- a/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc +++ b/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/browser_dialogs.h" +#include "chrome/browser/ui/views/browser_dialogs.h" #include "chrome/test/ui_test_utils.h" namespace chromeos { diff --git a/chrome/browser/chromeos/native_dialog_window.cc b/chrome/browser/chromeos/native_dialog_window.cc index 003912e..8f6cd90 100644 --- a/chrome/browser/chromeos/native_dialog_window.cc +++ b/chrome/browser/chromeos/native_dialog_window.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/frame/bubble_window.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/window.h" #include "views/controls/native/native_view_host.h" #include "views/window/dialog_delegate.h" #include "views/window/non_client_view.h" diff --git a/chrome/browser/chromeos/network_message_observer.cc b/chrome/browser/chromeos/network_message_observer.cc index 872dc73..582b152 100644 --- a/chrome/browser/chromeos/network_message_observer.cc +++ b/chrome/browser/chromeos/network_message_observer.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -18,7 +18,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/window.h" #include "chrome/common/pref_names.h" #include "chrome/common/time_format.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc index 8e9bb8d..5519354 100644 --- a/chrome/browser/chromeos/notifications/balloon_view.cc +++ b/chrome/browser/chromeos/notifications/balloon_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,7 +19,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" -#include "chrome/browser/views/notifications/balloon_view_host.h" +#include "chrome/browser/ui/views/notifications/balloon_view_host.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/chromeos/notifications/balloon_view_host.h b/chrome/browser/chromeos/notifications/balloon_view_host.h index 642ce36..02a8018 100644 --- a/chrome/browser/chromeos/notifications/balloon_view_host.h +++ b/chrome/browser/chromeos/notifications/balloon_view_host.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_NOTIFICATIONS_BALLOON_VIEW_HOST_H_ #pragma once -#include "chrome/browser/views/notifications/balloon_view_host.h" +#include "chrome/browser/ui/views/notifications/balloon_view_host.h" #include <map> #include <string> diff --git a/chrome/browser/chromeos/options/internet_page_view.cc b/chrome/browser/chromeos/options/internet_page_view.cc index 880ac05..3e56fd0 100644 --- a/chrome/browser/chromeos/options/internet_page_view.cc +++ b/chrome/browser/chromeos/options/internet_page_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,7 +14,7 @@ #include "chrome/browser/chromeos/options/network_config_view.h" #include "chrome/browser/chromeos/options/options_window_view.h" #include "chrome/browser/chromeos/status/network_menu.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/chromeos/options/language_chewing_config_view.h b/chrome/browser/chromeos/options/language_chewing_config_view.h index d7a33cf..c277d04 100644 --- a/chrome/browser/chromeos/options/language_chewing_config_view.h +++ b/chrome/browser/chromeos/options/language_chewing_config_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,7 +11,7 @@ #include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/prefs/pref_member.h" -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" #include "views/controls/button/checkbox.h" #include "views/controls/combobox/combobox.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/options/language_config_view.cc b/chrome/browser/chromeos/options/language_config_view.cc index 5e6716a..c728909 100644 --- a/chrome/browser/chromeos/options/language_config_view.cc +++ b/chrome/browser/chromeos/options/language_config_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,8 +19,8 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/views/restart_message_box.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/restart_message_box.h" +#include "chrome/browser/ui/views/window.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "gfx/font.h" diff --git a/chrome/browser/chromeos/options/language_config_view.h b/chrome/browser/chromeos/options/language_config_view.h index f625f03..b61ca77 100644 --- a/chrome/browser/chromeos/options/language_config_view.h +++ b/chrome/browser/chromeos/options/language_config_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,7 +13,7 @@ #include "app/table_model.h" #include "base/compiler_specific.h" #include "chrome/browser/chromeos/options/language_config_model.h" -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" #include "views/controls/button/native_button.h" #include "views/controls/combobox/combobox.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/options/language_hangul_config_view.h b/chrome/browser/chromeos/options/language_hangul_config_view.h index 58466b0..55bcef9 100644 --- a/chrome/browser/chromeos/options/language_hangul_config_view.h +++ b/chrome/browser/chromeos/options/language_hangul_config_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,7 +11,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/prefs/pref_member.h" -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" #include "views/controls/combobox/combobox.h" #include "views/controls/label.h" #include "views/window/dialog_delegate.h" diff --git a/chrome/browser/chromeos/options/language_mozc_config_view.h b/chrome/browser/chromeos/options/language_mozc_config_view.h index 496ec14..6afd504 100644 --- a/chrome/browser/chromeos/options/language_mozc_config_view.h +++ b/chrome/browser/chromeos/options/language_mozc_config_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,7 +11,7 @@ #include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/prefs/pref_member.h" -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" #include "views/controls/combobox/combobox.h" #include "views/controls/label.h" #include "views/controls/slider/slider.h" diff --git a/chrome/browser/chromeos/options/language_pinyin_config_view.h b/chrome/browser/chromeos/options/language_pinyin_config_view.h index 6d38bd5..4bbd1cc2 100644 --- a/chrome/browser/chromeos/options/language_pinyin_config_view.h +++ b/chrome/browser/chromeos/options/language_pinyin_config_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,7 +11,7 @@ #include "chrome/browser/chromeos/cros/input_method_library.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/prefs/pref_member.h" -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" #include "views/controls/button/checkbox.h" #include "views/controls/combobox/combobox.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/options/settings_page_view.h b/chrome/browser/chromeos/options/settings_page_view.h index 35e9934..07992d3 100644 --- a/chrome/browser/chromeos/options/settings_page_view.h +++ b/chrome/browser/chromeos/options/settings_page_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <gtk/gtk.h> -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" #include "views/grid_layout.h" #include "views/standard_layout.h" diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/setting_level_bubble.cc index 8395673..55aec2e 100644 --- a/chrome/browser/chromeos/setting_level_bubble.cc +++ b/chrome/browser/chromeos/setting_level_bubble.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,7 +12,7 @@ #include "chrome/browser/chromeos/setting_level_bubble_view.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" #include "views/widget/root_view.h" namespace { diff --git a/chrome/browser/chromeos/setting_level_bubble.h b/chrome/browser/chromeos/setting_level_bubble.h index 9cc43d9..372e570 100644 --- a/chrome/browser/chromeos/setting_level_bubble.h +++ b/chrome/browser/chromeos/setting_level_bubble.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/timer.h" -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index c09594d..027de77 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -17,7 +17,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/window.h" #include "gfx/canvas_skia.h" #include "gfx/skbitmap_operations.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/status/status_area_view.h b/chrome/browser/chromeos/status/status_area_view.h index bf852e9..77f8087 100644 --- a/chrome/browser/chromeos/status/status_area_view.h +++ b/chrome/browser/chromeos/status/status_area_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "chrome/browser/views/accessible_pane_view.h" +#include "chrome/browser/ui/views/accessible_pane_view.h" #include "views/view.h" namespace chromeos { diff --git a/chrome/browser/chromeos/views/domui_menu_widget.cc b/chrome/browser/chromeos/views/domui_menu_widget.cc index 8a5e360..f8e51d9 100644 --- a/chrome/browser/chromeos/views/domui_menu_widget.cc +++ b/chrome/browser/chromeos/views/domui_menu_widget.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,7 +15,7 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/dom_view.h" +#include "chrome/browser/ui/views/dom_view.h" #include "chrome/common/url_constants.h" #include "gfx/canvas_skia.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/chromeos/wm_overview_controller.cc b/chrome/browser/chromeos/wm_overview_controller.cc index 778af64..9f2e1ad 100644 --- a/chrome/browser/chromeos/wm_overview_controller.cc +++ b/chrome/browser/chromeos/wm_overview_controller.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -22,7 +22,7 @@ #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/common/notification_service.h" #include "views/widget/root_view.h" #include "views/widget/widget_gtk.h" diff --git a/chrome/browser/dom_ui/file_browse_browsertest.cc b/chrome/browser/dom_ui/file_browse_browsertest.cc index c8d7a1f..3df289d 100644 --- a/chrome/browser/dom_ui/file_browse_browsertest.cc +++ b/chrome/browser/dom_ui/file_browse_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #include "chrome/browser/dom_ui/dom_ui.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/html_dialog_view.h" +#include "chrome/browser/ui/views/html_dialog_view.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc index 8cca8b4..35f572b 100644 --- a/chrome/browser/dom_ui/ntp_resource_cache.cc +++ b/chrome/browser/dom_ui/ntp_resource_cache.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -43,7 +43,7 @@ #include "ui/base/animation/animation.h" #if defined(OS_WIN) || defined(TOOLKIT_VIEWS) -#include "chrome/browser/views/bookmark_bar_view.h" +#include "chrome/browser/ui/views/bookmark_bar_view.h" #elif defined(OS_MACOSX) #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" #elif defined(OS_POSIX) diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index fb69263..97f02b7 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -75,7 +75,7 @@ #include "app/win/win_util.h" #include "base/win/scoped_comptr.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #endif namespace download_util { diff --git a/chrome/browser/extensions/browser_action_test_util_views.cc b/chrome/browser/extensions/browser_action_test_util_views.cc index 0a384c5f..79d3f1ee 100644 --- a/chrome/browser/extensions/browser_action_test_util_views.cc +++ b/chrome/browser/extensions/browser_action_test_util_views.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,9 +7,9 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/views/browser_actions_container.h" -#include "chrome/browser/views/extensions/extension_popup.h" -#include "chrome/browser/views/toolbar_view.h" +#include "chrome/browser/ui/views/browser_actions_container.h" +#include "chrome/browser/ui/views/extensions/extension_popup.h" +#include "chrome/browser/ui/views/toolbar_view.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "gfx/rect.h" diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index df03580..b7a2e09 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -31,7 +31,7 @@ #include "net/test/test_server.h" #if defined(TOOLKIT_VIEWS) -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #endif const std::string kSubscribePage = "/subscribe.html"; diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h index 801bdab..234a1a7 100644 --- a/chrome/browser/extensions/extension_host.h +++ b/chrome/browser/extensions/extension_host.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,7 +16,7 @@ #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #if defined(TOOLKIT_VIEWS) -#include "chrome/browser/views/extensions/extension_view.h" +#include "chrome/browser/ui/views/extensions/extension_view.h" #elif defined(OS_MACOSX) #include "chrome/browser/ui/cocoa/extension_view_mac.h" #elif defined(TOOLKIT_GTK) diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc index cc5cb43..1e1c5d7 100644 --- a/chrome/browser/extensions/extension_input_api.cc +++ b/chrome/browser/extensions/extension_input_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,7 +12,7 @@ #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/common/native_web_keyboard_event.h" #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "views/event.h" diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc index 18013e0..9e6b386 100644 --- a/chrome/browser/extensions/extension_install_ui.cc +++ b/chrome/browser/extensions/extension_install_ui.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -38,7 +38,7 @@ #endif #if defined(TOOLKIT_VIEWS) -#include "chrome/browser/views/extensions/extension_installed_bubble.h" +#include "chrome/browser/ui/views/extensions/extension_installed_bubble.h" #endif #if defined(TOOLKIT_GTK) diff --git a/chrome/browser/extensions/extension_popup_api.cc b/chrome/browser/extensions/extension_popup_api.cc index 25d3657..07d9ba0 100644 --- a/chrome/browser/extensions/extension_popup_api.cc +++ b/chrome/browser/extensions/extension_popup_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -29,8 +29,8 @@ #include "gfx/point.h" #if defined(TOOLKIT_VIEWS) -#include "chrome/browser/views/bubble_border.h" -#include "chrome/browser/views/extensions/extension_popup.h" +#include "chrome/browser/ui/views/bubble_border.h" +#include "chrome/browser/ui/views/extensions/extension_popup.h" #include "views/view.h" #include "views/focus/focus_manager.h" #endif // TOOLKIT_VIEWS diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index ac4cfba..780854e 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -30,10 +30,10 @@ #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "chrome/browser/tab_contents/provisional_load_details.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/browser_dialogs.h" -#include "chrome/browser/views/page_info_bubble_view.h" -#include "chrome/browser/views/tab_contents/render_view_context_menu_views.h" -#include "chrome/browser/views/tab_contents/tab_contents_container.h" +#include "chrome/browser/ui/views/browser_dialogs.h" +#include "chrome/browser/ui/views/page_info_bubble_view.h" +#include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" #include "chrome/common/automation_messages.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h index f08f364..a853562 100644 --- a/chrome/browser/external_tab_container_win.h +++ b/chrome/browser/external_tab_container_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,9 +16,9 @@ #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/frame/browser_bubble_host.h" -#include "chrome/browser/views/infobars/infobar_container.h" -#include "chrome/browser/views/unhandled_keyboard_event_handler.h" +#include "chrome/browser/ui/views/frame/browser_bubble_host.h" +#include "chrome/browser/ui/views/infobars/infobar_container.h" +#include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" #include "chrome/common/navigation_types.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 5f6a0b0..2d9f240 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -32,7 +32,7 @@ #include "chrome/browser/process_singleton.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/views/first_run_search_engine_view.h" +#include "chrome/browser/ui/views/first_run_search_engine_view.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/gtk/infobar_gtk.cc b/chrome/browser/gtk/infobar_gtk.cc index 5a061d0..097f502 100644 --- a/chrome/browser/gtk/infobar_gtk.cc +++ b/chrome/browser/gtk/infobar_gtk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -239,7 +239,7 @@ void InfoBar::AddLabelAndLink(const string16& display_text, void InfoBar::GetTopColor(InfoBarDelegate::Type type, double* r, double* g, double *b) { // These constants are copied from corresponding skia constants from - // browser/views/infobars/infobars.cc, and then changed into 0-1 ranged + // browser/ui/views/infobars/infobars.cc, and then changed into 0-1 ranged // values for cairo. switch (type) { case InfoBarDelegate::WARNING_TYPE: diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index d69aff41..dd0f329 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -31,7 +31,7 @@ // TODO(port): Port these files. #if defined(OS_WIN) #include "app/win/win_util.h" -#include "chrome/browser/views/importer_lock_view.h" +#include "chrome/browser/ui/views/importer_lock_view.h" #include "views/window/window.h" #elif defined(OS_MACOSX) #include "chrome/browser/ui/cocoa/importer_lock_dialog.h" diff --git a/chrome/browser/notifications/balloon_collection_linux.cc b/chrome/browser/notifications/balloon_collection_linux.cc index 094c2b0..038746c 100644 --- a/chrome/browser/notifications/balloon_collection_linux.cc +++ b/chrome/browser/notifications/balloon_collection_linux.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/notifications/balloon_collection_impl.h" #include "chrome/browser/notifications/balloon.h" -#include "chrome/browser/views/notifications/balloon_view.h" +#include "chrome/browser/ui/views/notifications/balloon_view.h" #include "gfx/size.h" Balloon* BalloonCollectionImpl::MakeBalloon(const Notification& notification, diff --git a/chrome/browser/notifications/balloon_collection_win.cc b/chrome/browser/notifications/balloon_collection_win.cc index 7a979d9..7d66eb4 100644 --- a/chrome/browser/notifications/balloon_collection_win.cc +++ b/chrome/browser/notifications/balloon_collection_win.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/notifications/balloon_collection_impl.h" #include "chrome/browser/notifications/balloon.h" -#include "chrome/browser/views/notifications/balloon_view.h" +#include "chrome/browser/ui/views/notifications/balloon_view.h" #include "gfx/rect.h" Balloon* BalloonCollectionImpl::MakeBalloon(const Notification& notification, diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 1aa3c9e..a90aed0 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -56,8 +56,8 @@ #include "chrome/browser/upgrade_detector.h" #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port -#include "chrome/browser/views/browser_actions_container.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/browser_actions_container.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #endif #if defined(TOOLKIT_GTK) diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc index d34d939..da8d670 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -31,7 +31,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #if defined(TOOLKIT_VIEWS) -#include "chrome/browser/views/browser_dialogs.h" +#include "chrome/browser/ui/views/browser_dialogs.h" #endif // defined(TOOLKIT_GTK) #include "chrome/common/net/gaia/gaia_auth_fetcher.h" #include "chrome/common/net/gaia/gaia_constants.h" diff --git a/chrome/browser/shell_dialogs.h b/chrome/browser/shell_dialogs.h index d856720..23380f1 100644 --- a/chrome/browser/shell_dialogs.h +++ b/chrome/browser/shell_dialogs.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,7 +19,7 @@ class Font; } // This function is declared extern such that it is accessible for unit tests -// in /chrome/browser/views/shell_dialogs_win_unittest.cc +// in /chrome/browser/ui/views/shell_dialogs_win_unittest.cc extern std::wstring AppendExtensionIfNeeded(const std::wstring& filename, const std::wstring& filter_selected, const std::wstring& suggested_ext); diff --git a/chrome/browser/sidebar/sidebar_test.cc b/chrome/browser/sidebar/sidebar_test.cc index e567791..1d57333 100644 --- a/chrome/browser/sidebar/sidebar_test.cc +++ b/chrome/browser/sidebar/sidebar_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #include "chrome/browser/sidebar/sidebar_manager.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc index 2140ef4..934c8a5 100644 --- a/chrome/browser/speech/speech_input_bubble_views.cc +++ b/chrome/browser/speech/speech_input_bubble_views.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,7 +12,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/sync/sync_ui_util_mac.mm b/chrome/browser/sync/sync_ui_util_mac.mm index f65f2a0..3cd17d5 100644 --- a/chrome/browser/sync/sync_ui_util_mac.mm +++ b/chrome/browser/sync/sync_ui_util_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -40,7 +40,7 @@ void UpdateSyncItemForStatus(id syncItem, BOOL syncEnabled, } // TODO(akalin): consolidate this code with the equivalent Windows code in - // chrome/browser/views/toolbar_view.cc. + // chrome/browser/ui/views/toolbar_view.cc. int titleId; switch (status) { case sync_ui_util::SYNCED: diff --git a/chrome/browser/ui/cocoa/about_window_controller.mm b/chrome/browser/ui/cocoa/about_window_controller.mm index f83c9a1..7122ca3 100644 --- a/chrome/browser/ui/cocoa/about_window_controller.mm +++ b/chrome/browser/ui/cocoa/about_window_controller.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -645,7 +645,7 @@ static BOOL recentShownUserActionFailedStatus = NO; // it the best we can to get all the information in (they actually do it // but created Labels and Links that they carefully place to make it appear // to be a paragraph of text). - // src/chrome/browser/views/about_chrome_view.cc AboutChromeView::Init() + // src/chrome/browser/ui/views/about_chrome_view.cc AboutChromeView::Init() NSMutableAttributedString* legal_block = [[[NSMutableAttributedString alloc] init] autorelease]; diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index 6240065..013510f 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -906,7 +906,7 @@ // Update the checked/Unchecked state of items in the encoding menu. // On Windows, this logic is part of |EncodingMenuModel| in - // browser/views/toolbar_view.h. + // browser/ui/views/toolbar_view.h. EncodingMenuController encoding_controller; if (encoding_controller.DoesCommandBelongToEncodingMenu(tag)) { DCHECK(browser_.get()); diff --git a/chrome/browser/ui/cocoa/preferences_window_controller.mm b/chrome/browser/ui/cocoa/preferences_window_controller.mm index 950ec7b..84e5721 100644 --- a/chrome/browser/ui/cocoa/preferences_window_controller.mm +++ b/chrome/browser/ui/cocoa/preferences_window_controller.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -533,7 +533,7 @@ class ManagedPrefsBannerState : public policy::ManagedPrefsBannerBase { [animation_ setAnimationBlockingMode:NSAnimationNonblocking]; // TODO(akalin): handle incognito profiles? The windows version of this - // (in chrome/browser/views/options/content_page_view.cc) just does what + // (in chrome/browser/ui/views/options/content_page_view.cc) just does what // we do below. syncService_ = profile_->GetProfileSyncService(); diff --git a/chrome/browser/ui/cocoa/restart_browser.h b/chrome/browser/ui/cocoa/restart_browser.h index 27bdd35..d7e4ec1 100644 --- a/chrome/browser/ui/cocoa/restart_browser.h +++ b/chrome/browser/ui/cocoa/restart_browser.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -// This is a functional match for chrome/browser/views/restart_message_box +// This is a functional match for chrome/browser/ui/views/restart_message_box // so any code that needs to ask for a browser restart has something like what // the Windows code has. namespace restart_browser { diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index 4923ea7..06a7b12 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -22,7 +22,7 @@ #include "net/test/test_server.h" #if defined(TOOLKIT_VIEWS) -#include "chrome/browser/views/find_bar_host.h" +#include "chrome/browser/ui/views/find_bar_host.h" #include "views/focus/focus_manager.h" #elif defined(TOOLKIT_GTK) #include "chrome/browser/gtk/slide_animator_gtk.h" diff --git a/chrome/browser/ui/tabs/dock_info.cc b/chrome/browser/ui/tabs/dock_info.cc index 97fe29d..4fe732a7 100644 --- a/chrome/browser/ui/tabs/dock_info.cc +++ b/chrome/browser/ui/tabs/dock_info.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/ui/tabs/dock_info.h" #if defined(TOOLKIT_VIEWS) -#include "chrome/browser/views/tabs/tab.h" +#include "chrome/browser/ui/views/tabs/tab.h" #else #include "chrome/browser/gtk/tabs/tab_gtk.h" #endif diff --git a/chrome/browser/ui/tabs/dock_info_win.cc b/chrome/browser/ui/tabs/dock_info_win.cc index c9aa412..c4d57e9 100644 --- a/chrome/browser/ui/tabs/dock_info_win.cc +++ b/chrome/browser/ui/tabs/dock_info_win.cc @@ -8,8 +8,8 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/tabs/tab.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/tabs/tab.h" namespace { diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index 341c6f8..83be1dc 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/about_chrome_view.h" +#include "chrome/browser/ui/views/about_chrome_view.h" #if defined(OS_WIN) #include <commdlg.h> @@ -24,8 +24,8 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/views/accessible_view_helper.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/accessible_view_helper.h" +#include "chrome/browser/ui/views/window.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" @@ -46,7 +46,7 @@ #if defined(OS_WIN) #include "base/win/win_util.h" -#include "chrome/browser/views/restart_message_box.h" +#include "chrome/browser/ui/views/restart_message_box.h" #include "chrome/installer/util/install_util.h" #endif // defined(OS_WIN) diff --git a/chrome/browser/ui/views/about_ipc_dialog.cc b/chrome/browser/ui/views/about_ipc_dialog.cc index c072d3e..b0c6c89 100644 --- a/chrome/browser/ui/views/about_ipc_dialog.cc +++ b/chrome/browser/ui/views/about_ipc_dialog.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,7 +11,7 @@ #ifdef IPC_MESSAGE_LOG_ENABLED #define IPC_MESSAGE_MACROS_LOG_ENABLED -#include "chrome/browser/views/about_ipc_dialog.h" +#include "chrome/browser/ui/views/about_ipc_dialog.h" #include <set> diff --git a/chrome/browser/ui/views/accelerator_table_gtk.cc b/chrome/browser/ui/views/accelerator_table_gtk.cc index c87580b..5a3d0f7 100644 --- a/chrome/browser/ui/views/accelerator_table_gtk.cc +++ b/chrome/browser/ui/views/accelerator_table_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/accelerator_table_gtk.h" +#include "chrome/browser/ui/views/accelerator_table_gtk.h" #include "app/keyboard_codes.h" #include "base/basictypes.h" diff --git a/chrome/browser/ui/views/accessibility_event_router_views.cc b/chrome/browser/ui/views/accessibility_event_router_views.cc index b563b8d..d088849 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/accessibility_event_router_views.h" +#include "chrome/browser/ui/views/accessibility_event_router_views.h" #include "base/basictypes.h" #include "base/callback.h" @@ -11,7 +11,7 @@ #include "chrome/browser/extensions/extension_accessibility_api.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/common/notification_type.h" #include "views/accessibility/accessibility_types.h" #include "views/controls/button/custom_button.h" diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc index df8af57..6948e93 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,8 +8,8 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_accessibility_api.h" -#include "chrome/browser/views/accessibility_event_router_views.h" -#include "chrome/browser/views/accessible_view_helper.h" +#include "chrome/browser/ui/views/accessibility_event_router_views.h" +#include "chrome/browser/ui/views/accessible_view_helper.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" #include "chrome/test/testing_profile.h" diff --git a/chrome/browser/ui/views/accessible_view_helper.cc b/chrome/browser/ui/views/accessible_view_helper.cc index ca15381..b2c17ad 100644 --- a/chrome/browser/ui/views/accessible_view_helper.cc +++ b/chrome/browser/ui/views/accessible_view_helper.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/accessible_view_helper.h" +#include "chrome/browser/ui/views/accessible_view_helper.h" #include "app/l10n_util.h" #include "chrome/browser/accessibility_events.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/views/accessibility_event_router_views.h" +#include "chrome/browser/ui/views/accessibility_event_router_views.h" #include "chrome/common/notification_service.h" #include "views/controls/native/native_view_host.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/appcache_info_view.cc b/chrome/browser/ui/views/appcache_info_view.cc index 03d3919..199d256 100644 --- a/chrome/browser/ui/views/appcache_info_view.cc +++ b/chrome/browser/ui/views/appcache_info_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/appcache_info_view.h" +#include "chrome/browser/ui/views/appcache_info_view.h" #include "base/i18n/time_formatting.h" #include "base/string_util.h" diff --git a/chrome/browser/ui/views/appcache_info_view.h b/chrome/browser/ui/views/appcache_info_view.h index 141524a..a37ef4d 100644 --- a/chrome/browser/ui/views/appcache_info_view.h +++ b/chrome/browser/ui/views/appcache_info_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_APPCACHE_INFO_VIEW_H_ #pragma once -#include "chrome/browser/views/generic_info_view.h" +#include "chrome/browser/ui/views/generic_info_view.h" #include "chrome/browser/browsing_data_appcache_helper.h" // AppCacheInfoView diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc index 059de7e..d381029 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" +#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" #include "app/bidi_line_iterator.h" #include "app/l10n_util.h" @@ -18,8 +18,8 @@ #include "chrome/browser/instant/instant_confirm_dialog.h" #include "chrome/browser/instant/promo_counter.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/views/bubble_border.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/bubble_border.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "gfx/canvas_skia.h" #include "gfx/color_utils.h" #include "gfx/insets.h" diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h index 72cb7bd..640fee2 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,9 +16,9 @@ #include "webkit/glue/window_open_disposition.h" #if defined(OS_WIN) -#include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" +#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_win.h" #else -#include "chrome/browser/views/autocomplete/autocomplete_popup_gtk.h" +#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.h" #endif class AutocompleteEditModel; diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.cc index 4bb7f09..d78ea13 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/autocomplete/autocomplete_popup_gtk.h" +#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.h" #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" +#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" #include "gfx/insets.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_win.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_win.cc index e720108..9f48dcd 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_win.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_win.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" +#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_win.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" -#include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" +#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" #include "gfx/insets.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/views/autofill_profiles_view_win.cc b/chrome/browser/ui/views/autofill_profiles_view_win.cc index d7f1cc8..3b1670da 100644 --- a/chrome/browser/ui/views/autofill_profiles_view_win.cc +++ b/chrome/browser/ui/views/autofill_profiles_view_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/autofill_profiles_view_win.h" +#include "chrome/browser/ui/views/autofill_profiles_view_win.h" #include <vsstyle.h> #include <vssym32.h> diff --git a/chrome/browser/ui/views/bookmark_bar_instructions_view.cc b/chrome/browser/ui/views/bookmark_bar_instructions_view.cc index 36af2a6..53945a9 100644 --- a/chrome/browser/ui/views/bookmark_bar_instructions_view.cc +++ b/chrome/browser/ui/views/bookmark_bar_instructions_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/bookmark_bar_instructions_view.h" +#include "chrome/browser/ui/views/bookmark_bar_instructions_view.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/views/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmark_bar_view.cc index 42f481e..fa1e444 100644 --- a/chrome/browser/ui/views/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmark_bar_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/bookmark_bar_view.h" +#include "chrome/browser/ui/views/bookmark_bar_view.h" #include <algorithm> #include <limits> @@ -53,7 +53,7 @@ #include "views/window/window.h" #if defined(OS_WIN) -#include "chrome/browser/views/importer_view.h" +#include "chrome/browser/ui/views/importer_view.h" #endif using views::CustomButton; diff --git a/chrome/browser/ui/views/bookmark_bar_view.h b/chrome/browser/ui/views/bookmark_bar_view.h index 79709f4..1687c2e 100644 --- a/chrome/browser/ui/views/bookmark_bar_view.h +++ b/chrome/browser/ui/views/bookmark_bar_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,9 +11,9 @@ #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/browser/views/bookmark_bar_instructions_view.h" -#include "chrome/browser/views/bookmark_menu_controller_views.h" -#include "chrome/browser/views/detachable_toolbar_view.h" +#include "chrome/browser/ui/views/bookmark_bar_instructions_view.h" +#include "chrome/browser/ui/views/bookmark_menu_controller_views.h" +#include "chrome/browser/ui/views/detachable_toolbar_view.h" #include "chrome/common/notification_registrar.h" #include "ui/base/animation/animation_delegate.h" #include "views/controls/button/button.h" diff --git a/chrome/browser/ui/views/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmark_bar_view_test.cc index 67d2436..bc1253c 100644 --- a/chrome/browser/ui/views/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmark_bar_view_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,7 +12,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/page_navigator.h" -#include "chrome/browser/views/bookmark_bar_view.h" +#include "chrome/browser/ui/views/bookmark_bar_view.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_profile.h" diff --git a/chrome/browser/ui/views/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmark_bar_view_unittest.cc index 3f66795..42181e2 100644 --- a/chrome/browser/ui/views/bookmark_bar_view_unittest.cc +++ b/chrome/browser/ui/views/bookmark_bar_view_unittest.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_thread.h" -#include "chrome/browser/views/bookmark_bar_view.h" +#include "chrome/browser/ui/views/bookmark_bar_view.h" #include "chrome/test/browser_with_test_window_test.h" #include "chrome/test/testing_profile.h" diff --git a/chrome/browser/ui/views/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmark_bubble_view.cc index fdb47df..54b2a77 100644 --- a/chrome/browser/ui/views/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmark_bubble_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/bookmark_bubble_view.h" +#include "chrome/browser/ui/views/bookmark_bubble_view.h" #include "app/keyboard_codes.h" #include "app/l10n_util.h" @@ -16,7 +16,7 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" #include "chrome/common/notification_service.h" #include "gfx/canvas.h" #include "gfx/color_utils.h" diff --git a/chrome/browser/ui/views/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmark_bubble_view.h index d411c01c..edf2a9e 100644 --- a/chrome/browser/ui/views/bookmark_bubble_view.h +++ b/chrome/browser/ui/views/bookmark_bubble_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/string16.h" #include "chrome/browser/bookmarks/recently_used_folders_combo_model.h" -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" #include "gfx/rect.h" #include "googleurl/src/gurl.h" #include "views/controls/button/button.h" diff --git a/chrome/browser/ui/views/bookmark_context_menu.cc b/chrome/browser/ui/views/bookmark_context_menu.cc index 9067dd9..67e6ded 100644 --- a/chrome/browser/ui/views/bookmark_context_menu.cc +++ b/chrome/browser/ui/views/bookmark_context_menu.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/bookmark_context_menu.h" +#include "chrome/browser/ui/views/bookmark_context_menu.h" #include "app/l10n_util.h" #include "base/i18n/rtl.h" diff --git a/chrome/browser/ui/views/bookmark_context_menu.h b/chrome/browser/ui/views/bookmark_context_menu.h index c6cd19d..86befa4 100644 --- a/chrome/browser/ui/views/bookmark_context_menu.h +++ b/chrome/browser/ui/views/bookmark_context_menu.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_BOOKMARK_CONTEXT_MENU_H_ #pragma once -#include "chrome/browser/views/bookmark_context_menu_controller_views.h" +#include "chrome/browser/ui/views/bookmark_context_menu_controller_views.h" #include "views/controls/menu/menu_delegate.h" // Observer for the BookmarkContextMenu. diff --git a/chrome/browser/ui/views/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmark_context_menu_controller_views.cc index b2f7c29..8f6c29c 100644 --- a/chrome/browser/ui/views/bookmark_context_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmark_context_menu_controller_views.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/bookmark_context_menu_controller_views.h" +#include "chrome/browser/ui/views/bookmark_context_menu_controller_views.h" #include "base/compiler_specific.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/ui/views/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmark_context_menu_test.cc index 8cf12d4..43ae9ae 100644 --- a/chrome/browser/ui/views/bookmark_context_menu_test.cc +++ b/chrome/browser/ui/views/bookmark_context_menu_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,14 +11,14 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/page_navigator.h" -#include "chrome/browser/views/bookmark_context_menu.h" +#include "chrome/browser/ui/views/bookmark_context_menu.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_profile.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_WIN) -#include "chrome/browser/views/bookmark_bar_view.h" +#include "chrome/browser/ui/views/bookmark_bar_view.h" #endif namespace { diff --git a/chrome/browser/ui/views/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmark_editor_view.cc index c6768c4..8ae0c5d 100644 --- a/chrome/browser/ui/views/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmark_editor_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/bookmark_editor_view.h" +#include "chrome/browser/ui/views/bookmark_editor_view.h" #include "app/l10n_util.h" #include "base/basictypes.h" diff --git a/chrome/browser/ui/views/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmark_editor_view_unittest.cc index b2d9dea3..f137b5d 100644 --- a/chrome/browser/ui/views/bookmark_editor_view_unittest.cc +++ b/chrome/browser/ui/views/bookmark_editor_view_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include "chrome/browser/browser_thread.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/views/bookmark_editor_view.h" +#include "chrome/browser/ui/views/bookmark_editor_view.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/views/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmark_menu_controller_views.cc index 8829dac..fd20ec6 100644 --- a/chrome/browser/ui/views/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmark_menu_controller_views.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/bookmark_menu_controller_views.h" +#include "chrome/browser/ui/views/bookmark_menu_controller_views.h" #include "app/os_exchange_data.h" #include "app/resource_bundle.h" @@ -14,8 +14,8 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/page_navigator.h" -#include "chrome/browser/views/bookmark_bar_view.h" -#include "chrome/browser/views/event_utils.h" +#include "chrome/browser/ui/views/bookmark_bar_view.h" +#include "chrome/browser/ui/views/event_utils.h" #include "chrome/common/page_transition_types.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmark_menu_controller_views.h index 3d4f013..a468266 100644 --- a/chrome/browser/ui/views/bookmark_menu_controller_views.h +++ b/chrome/browser/ui/views/bookmark_menu_controller_views.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,7 +11,7 @@ #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" -#include "chrome/browser/views/bookmark_context_menu.h" +#include "chrome/browser/ui/views/bookmark_context_menu.h" #include "gfx/native_widget_types.h" #include "views/controls/menu/menu_delegate.h" #include "views/controls/menu/menu_item_view.h" diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index 44a4a00..0ebfac4 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/browser_actions_container.h" +#include "chrome/browser/ui/views/browser_actions_container.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h index 5291ece..235bede 100644 --- a/chrome/browser/ui/views/browser_actions_container.h +++ b/chrome/browser/ui/views/browser_actions_container.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,9 +14,9 @@ #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/extensions/extension_toolbar_model.h" #include "chrome/browser/extensions/image_loading_tracker.h" -#include "chrome/browser/views/browser_bubble.h" -#include "chrome/browser/views/extensions/browser_action_overflow_menu_controller.h" -#include "chrome/browser/views/extensions/extension_popup.h" +#include "chrome/browser/ui/views/browser_bubble.h" +#include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h" +#include "chrome/browser/ui/views/extensions/extension_popup.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "ui/base/animation/animation_delegate.h" diff --git a/chrome/browser/ui/views/browser_actions_container_browsertest.cc b/chrome/browser/ui/views/browser_actions_container_browsertest.cc index 8751881..d2f21bd 100644 --- a/chrome/browser/ui/views/browser_actions_container_browsertest.cc +++ b/chrome/browser/ui/views/browser_actions_container_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/browser_actions_container.h" +#include "chrome/browser/ui/views/browser_actions_container.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_resource.h" diff --git a/chrome/browser/ui/views/browser_bubble.cc b/chrome/browser/ui/views/browser_bubble.cc index a118852..bd3c20a 100644 --- a/chrome/browser/ui/views/browser_bubble.cc +++ b/chrome/browser/ui/views/browser_bubble.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/browser_bubble.h" +#include "chrome/browser/ui/views/browser_bubble.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #if defined(OS_WIN) #include "chrome/browser/external_tab_container_win.h" #endif diff --git a/chrome/browser/ui/views/browser_bubble_gtk.cc b/chrome/browser/ui/views/browser_bubble_gtk.cc index 631aff7..1b45997 100644 --- a/chrome/browser/ui/views/browser_bubble_gtk.cc +++ b/chrome/browser/ui/views/browser_bubble_gtk.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/browser_bubble.h" +#include "chrome/browser/ui/views/browser_bubble.h" #include <vector> -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "views/widget/widget_gtk.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/browser_bubble_win.cc b/chrome/browser/ui/views/browser_bubble_win.cc index 84985fd..7e7f179 100644 --- a/chrome/browser/ui/views/browser_bubble_win.cc +++ b/chrome/browser/ui/views/browser_bubble_win.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/browser_bubble.h" +#include "chrome/browser/ui/views/browser_bubble.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "views/widget/root_view.h" #include "views/widget/widget_win.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/browser_keyboard_accessibility_test_win.cc b/chrome/browser/ui/views/browser_keyboard_accessibility_test_win.cc index ea7e52e..0c31a5b 100644 --- a/chrome/browser/ui/views/browser_keyboard_accessibility_test_win.cc +++ b/chrome/browser/ui/views/browser_keyboard_accessibility_test_win.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "app/keyboard_codes.h" #include "chrome/browser/automation/ui_controls.h" -#include "chrome/browser/views/chrome_views_delegate.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/chrome_views_delegate.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "views/view.h" diff --git a/chrome/browser/ui/views/bubble_border.cc b/chrome/browser/ui/views/bubble_border.cc index e37f5fe..c0c1642 100644 --- a/chrome/browser/ui/views/bubble_border.cc +++ b/chrome/browser/ui/views/bubble_border.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/bubble_border.h" +#include "chrome/browser/ui/views/bubble_border.h" #include "app/resource_bundle.h" #include "base/logging.h" diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc index b52e103..86faf4c 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.cc +++ b/chrome/browser/ui/views/chrome_views_delegate.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/chrome_views_delegate.h" +#include "chrome/browser/ui/views/chrome_views_delegate.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/views/clear_browsing_data.cc b/chrome/browser/ui/views/clear_browsing_data.cc index 0693d5a..36ff285 100644 --- a/chrome/browser/ui/views/clear_browsing_data.cc +++ b/chrome/browser/ui/views/clear_browsing_data.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/clear_browsing_data.h" +#include "chrome/browser/ui/views/clear_browsing_data.h" #include "app/l10n_util.h" #include "base/string16.h" @@ -13,7 +13,7 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/ui/browser.h" #if defined(OS_WIN) -#include "chrome/browser/views/clear_browsing_data_view.h" +#include "chrome/browser/ui/views/clear_browsing_data_view.h" #endif #include "chrome/common/pref_names.h" #include "gfx/insets.h" diff --git a/chrome/browser/ui/views/clear_browsing_data_view.cc b/chrome/browser/ui/views/clear_browsing_data_view.cc index 2aced59..0a4eb9e 100644 --- a/chrome/browser/ui/views/clear_browsing_data_view.cc +++ b/chrome/browser/ui/views/clear_browsing_data_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/clear_browsing_data_view.h" +#include "chrome/browser/ui/views/clear_browsing_data_view.h" #include "app/l10n_util.h" #include "base/string16.h" diff --git a/chrome/browser/ui/views/clear_browsing_data_view.h b/chrome/browser/ui/views/clear_browsing_data_view.h index 0659057..4145b7b 100644 --- a/chrome/browser/ui/views/clear_browsing_data_view.h +++ b/chrome/browser/ui/views/clear_browsing_data_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "app/combobox_model.h" #include "chrome/browser/browsing_data_remover.h" -#include "chrome/browser/views/clear_data_view.h" +#include "chrome/browser/ui/views/clear_data_view.h" #include "views/controls/button/button.h" #include "views/controls/combobox/combobox.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/clear_data_view.cc b/chrome/browser/ui/views/clear_data_view.cc index 839d668..681ac6e 100644 --- a/chrome/browser/ui/views/clear_data_view.cc +++ b/chrome/browser/ui/views/clear_data_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/clear_data_view.h" +#include "chrome/browser/ui/views/clear_data_view.h" #include "app/l10n_util.h" #include "base/string16.h" @@ -12,8 +12,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/clear_browsing_data.h" -#include "chrome/browser/views/clear_server_data.h" +#include "chrome/browser/ui/views/clear_browsing_data.h" +#include "chrome/browser/ui/views/clear_server_data.h" #include "chrome/common/pref_names.h" #include "gfx/insets.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/clear_data_view.h b/chrome/browser/ui/views/clear_data_view.h index ffd9338..d7a354e 100644 --- a/chrome/browser/ui/views/clear_data_view.h +++ b/chrome/browser/ui/views/clear_data_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,8 +8,8 @@ #include "app/combobox_model.h" #include "chrome/browser/browsing_data_remover.h" -#include "chrome/browser/views/clear_browsing_data_view.h" -#include "chrome/browser/views/clear_server_data.h" +#include "chrome/browser/ui/views/clear_browsing_data_view.h" +#include "chrome/browser/ui/views/clear_server_data.h" #include "views/controls/button/button.h" #include "views/controls/combobox/combobox.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/clear_server_data.cc b/chrome/browser/ui/views/clear_server_data.cc index 34c158d..6a9d54d 100644 --- a/chrome/browser/ui/views/clear_server_data.cc +++ b/chrome/browser/ui/views/clear_server_data.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/clear_server_data.h" +#include "chrome/browser/ui/views/clear_server_data.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/ui/views/clear_server_data.h b/chrome/browser/ui/views/clear_server_data.h index 6d0f09f..ed3dad4 100644 --- a/chrome/browser/ui/views/clear_server_data.h +++ b/chrome/browser/ui/views/clear_server_data.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,8 +8,8 @@ #include "app/combobox_model.h" #include "chrome/browser/browsing_data_remover.h" -#include "chrome/browser/views/clear_data_view.h" -#include "chrome/browser/views/confirm_message_box_dialog.h" +#include "chrome/browser/ui/views/clear_data_view.h" +#include "chrome/browser/ui/views/confirm_message_box_dialog.h" #include "chrome/browser/sync/profile_sync_service.h" #include "views/controls/button/button.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index a545971..889b653 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/collected_cookies_win.h" +#include "chrome/browser/ui/views/collected_cookies_win.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/ui/views/confirm_message_box_dialog.cc b/chrome/browser/ui/views/confirm_message_box_dialog.cc index 10569f9..5d5b4e8 100644 --- a/chrome/browser/ui/views/confirm_message_box_dialog.cc +++ b/chrome/browser/ui/views/confirm_message_box_dialog.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/confirm_message_box_dialog.h" +#include "chrome/browser/ui/views/confirm_message_box_dialog.h" #include "app/l10n_util.h" #include "app/message_box_flags.h" diff --git a/chrome/browser/ui/views/constrained_html_delegate_win.cc b/chrome/browser/ui/views/constrained_html_delegate_win.cc index 34d638e..ecf22c6 100644 --- a/chrome/browser/ui/views/constrained_html_delegate_win.cc +++ b/chrome/browser/ui/views/constrained_html_delegate_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/tab_contents/tab_contents_container.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" #include "gfx/rect.h" #include "ipc/ipc_message.h" #include "views/view.h" @@ -62,7 +62,7 @@ class ConstrainedHtmlDelegateWin : public TabContentsContainer, window_ = window; } -private: + private: TabContents html_tab_contents_; HtmlDialogUIDelegate* html_delegate_; diff --git a/chrome/browser/ui/views/constrained_window_win.cc b/chrome/browser/ui/views/constrained_window_win.cc index 121605f..b7a8720 100644 --- a/chrome/browser/ui/views/constrained_window_win.cc +++ b/chrome/browser/ui/views/constrained_window_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/constrained_window_win.h" +#include "chrome/browser/ui/views/constrained_window_win.h" #include "app/resource_bundle.h" #include "app/win/hwnd_util.h" diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc index 25122f2..4adf83c 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.cc +++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/content_setting_bubble_contents.h" +#include "chrome/browser/ui/views/content_setting_bubble_contents.h" #if defined(OS_LINUX) #include <gdk/gdk.h> @@ -16,8 +16,8 @@ #include "chrome/browser/plugin_updater.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/browser_dialogs.h" -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/browser_dialogs.h" +#include "chrome/browser/ui/views/info_bubble.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc index 0b3fe98..46e87ce 100644 --- a/chrome/browser/ui/views/cookie_info_view.cc +++ b/chrome/browser/ui/views/cookie_info_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/cookie_info_view.h" +#include "chrome/browser/ui/views/cookie_info_view.h" #include <algorithm> diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 61415fb..dcbe13f 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/create_application_shortcut_view.h" +#include "chrome/browser/ui/views/create_application_shortcut_view.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/ui/views/database_info_view.cc b/chrome/browser/ui/views/database_info_view.cc index 065d814..6b6b802 100644 --- a/chrome/browser/ui/views/database_info_view.cc +++ b/chrome/browser/ui/views/database_info_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/database_info_view.h" +#include "chrome/browser/ui/views/database_info_view.h" #include <algorithm> diff --git a/chrome/browser/ui/views/database_open_info_view.cc b/chrome/browser/ui/views/database_open_info_view.cc index 02e7fae..7bdbbef 100644 --- a/chrome/browser/ui/views/database_open_info_view.cc +++ b/chrome/browser/ui/views/database_open_info_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/database_open_info_view.h" +#include "chrome/browser/ui/views/database_open_info_view.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/views/database_open_info_view.h b/chrome/browser/ui/views/database_open_info_view.h index c8df3cd..8dd69e5 100644 --- a/chrome/browser/ui/views/database_open_info_view.h +++ b/chrome/browser/ui/views/database_open_info_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include "base/string16.h" -#include "chrome/browser/views/generic_info_view.h" +#include "chrome/browser/ui/views/generic_info_view.h" /////////////////////////////////////////////////////////////////////////////// // DatabaseOpenInfoView diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc index b2c1e27..bf48c06 100644 --- a/chrome/browser/ui/views/default_search_view.cc +++ b/chrome/browser/ui/views/default_search_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/default_search_view.h" +#include "chrome/browser/ui/views/default_search_view.h" #include <string> diff --git a/chrome/browser/ui/views/detachable_toolbar_view.cc b/chrome/browser/ui/views/detachable_toolbar_view.cc index e2aaa3a..7f04409 100644 --- a/chrome/browser/ui/views/detachable_toolbar_view.cc +++ b/chrome/browser/ui/views/detachable_toolbar_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/detachable_toolbar_view.h" +#include "chrome/browser/ui/views/detachable_toolbar_view.h" #include "app/resource_bundle.h" #include "chrome/browser/themes/browser_theme_provider.h" diff --git a/chrome/browser/ui/views/detachable_toolbar_view.h b/chrome/browser/ui/views/detachable_toolbar_view.h index 65008e0..64547b6 100644 --- a/chrome/browser/ui/views/detachable_toolbar_view.h +++ b/chrome/browser/ui/views/detachable_toolbar_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_DETACHABLE_TOOLBAR_VIEW_H_ #pragma once -#include "chrome/browser/views/accessible_pane_view.h" +#include "chrome/browser/ui/views/accessible_pane_view.h" class SkBitmap; struct SkRect; diff --git a/chrome/browser/ui/views/dom_view.cc b/chrome/browser/ui/views/dom_view.cc index cc442d3..ec5e78f 100644 --- a/chrome/browser/ui/views/dom_view.cc +++ b/chrome/browser/ui/views/dom_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/dom_view.h" +#include "chrome/browser/ui/views/dom_view.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "ipc/ipc_message.h" diff --git a/chrome/browser/ui/views/dom_view_browsertest.cc b/chrome/browser/ui/views/dom_view_browsertest.cc index 59cdef9..1e7ed8d7 100644 --- a/chrome/browser/ui/views/dom_view_browsertest.cc +++ b/chrome/browser/ui/views/dom_view_browsertest.cc @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/dom_view.h" +#include "chrome/browser/ui/views/dom_view.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/ui/views/download_item_view.cc b/chrome/browser/ui/views/download_item_view.cc index 474b27b..9f190f9 100644 --- a/chrome/browser/ui/views/download_item_view.cc +++ b/chrome/browser/ui/views/download_item_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/download_item_view.h" +#include "chrome/browser/ui/views/download_item_view.h" #include <vector> @@ -20,7 +20,7 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/themes/browser_theme_provider.h" -#include "chrome/browser/views/download_shelf_view.h" +#include "chrome/browser/ui/views/download_shelf_view.h" #include "gfx/canvas_skia.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/download_shelf_view.cc b/chrome/browser/ui/views/download_shelf_view.cc index c3a4ea3..663b612 100644 --- a/chrome/browser/ui/views/download_shelf_view.cc +++ b/chrome/browser/ui/views/download_shelf_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/download_shelf_view.h" +#include "chrome/browser/ui/views/download_shelf_view.h" #include <algorithm> diff --git a/chrome/browser/ui/views/download_shelf_view.h b/chrome/browser/ui/views/download_shelf_view.h index e7c1253..8d9c1f0 100644 --- a/chrome/browser/ui/views/download_shelf_view.h +++ b/chrome/browser/ui/views/download_shelf_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/download/download_shelf.h" -#include "chrome/browser/views/accessible_pane_view.h" +#include "chrome/browser/ui/views/accessible_pane_view.h" #include "ui/base/animation/animation_delegate.h" #include "views/controls/button/button.h" #include "views/controls/link.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host.cc b/chrome/browser/ui/views/dropdown_bar_host.cc index 5a1c2ad..e181565f 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.cc +++ b/chrome/browser/ui/views/dropdown_bar_host.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/dropdown_bar_host.h" +#include "chrome/browser/ui/views/dropdown_bar_host.h" #include "app/keyboard_codes.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc index 298ca75..763caa4 100644 --- a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc +++ b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/dropdown_bar_host.h" +#include "chrome/browser/ui/views/dropdown_bar_host.h" #include <gdk/gdkkeysyms.h> #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "views/widget/widget_gtk.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host_win.cc b/chrome/browser/ui/views/dropdown_bar_host_win.cc index df55449..99d12a9 100644 --- a/chrome/browser/ui/views/dropdown_bar_host_win.cc +++ b/chrome/browser/ui/views/dropdown_bar_host_win.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/dropdown_bar_host.h" +#include "chrome/browser/ui/views/dropdown_bar_host.h" #include "app/keyboard_code_conversion_win.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "views/controls/scrollbar/native_scroll_bar.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index e699e97..7372379 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/edit_search_engine_dialog.h" +#include "chrome/browser/ui/views/edit_search_engine_dialog.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/ui/views/event_utils.cc b/chrome/browser/ui/views/event_utils.cc index 06b9f0d..33704bb 100644 --- a/chrome/browser/ui/views/event_utils.cc +++ b/chrome/browser/ui/views/event_utils.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/event_utils.h" +#include "chrome/browser/ui/views/event_utils.h" #include "views/event.h" diff --git a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc index 565c89c..0be07f3 100644 --- a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc +++ b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/extensions/browser_action_drag_data.h" +#include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" #include "base/logging.h" #include "base/pickle.h" diff --git a/chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc b/chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc index 226591f..370796c 100644 --- a/chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc +++ b/chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "app/os_exchange_data.h" #include "app/os_exchange_data_provider_win.h" #include "base/pickle.h" -#include "chrome/browser/views/extensions/browser_action_drag_data.h" +#include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" #include "chrome/test/testing_profile.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc index 509188f..29edcc0a 100644 --- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc +++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/extensions/browser_action_overflow_menu_controller.h" +#include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/views/browser_actions_container.h" -#include "chrome/browser/views/extensions/browser_action_drag_data.h" +#include "chrome/browser/ui/views/browser_actions_container.h" +#include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "gfx/canvas_skia.h" diff --git a/chrome/browser/ui/views/extensions/extension_install_prompt.cc b/chrome/browser/ui/views/extensions/extension_install_prompt.cc index ea32328..8128737 100644 --- a/chrome/browser/ui/views/extensions/extension_install_prompt.cc +++ b/chrome/browser/ui/views/extensions/extension_install_prompt.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_install_ui.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/window.h" #include "chrome/common/extensions/extension.h" #include "grit/generated_resources.h" #include "views/controls/button/checkbox.h" diff --git a/chrome/browser/ui/views/extensions/extension_install_prompt2.cc b/chrome/browser/ui/views/extensions/extension_install_prompt2.cc index 0a4e2d6..18793e5 100644 --- a/chrome/browser/ui/views/extensions/extension_install_prompt2.cc +++ b/chrome/browser/ui/views/extensions/extension_install_prompt2.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/common/extensions/extension.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/window.h" #include "grit/generated_resources.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index b2e0697..93de3c5 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/extensions/extension_installed_bubble.h" +#include "chrome/browser/ui/views/extensions/extension_installed_bubble.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -12,10 +12,10 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/browser_actions_container.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" -#include "chrome/browser/views/toolbar_view.h" +#include "chrome/browser/ui/views/browser_actions_container.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/toolbar_view.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/notification_details.h" diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.h b/chrome/browser/ui/views/extensions/extension_installed_bubble.h index bbe12f5..ff15b6d 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.h +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include "base/ref_counted.h" -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc index 0271fa4..bfd56c8 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/extensions/extension_popup.h" +#include "chrome/browser/ui/views/extensions/extension_popup.h" #include <vector> diff --git a/chrome/browser/ui/views/extensions/extension_popup.h b/chrome/browser/ui/views/extensions/extension_popup.h index 0fc6f92..6435a7e 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.h +++ b/chrome/browser/ui/views/extensions/extension_popup.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,9 +7,9 @@ #pragma once #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/views/browser_bubble.h" -#include "chrome/browser/views/extensions/extension_view.h" -#include "chrome/browser/views/bubble_border.h" +#include "chrome/browser/ui/views/browser_bubble.h" +#include "chrome/browser/ui/views/extensions/extension_view.h" +#include "chrome/browser/ui/views/bubble_border.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "gfx/native_widget_types.h" diff --git a/chrome/browser/ui/views/extensions/extension_view.cc b/chrome/browser/ui/views/extensions/extension_view.cc index fcace1a..f34b6ad 100644 --- a/chrome/browser/ui/views/extensions/extension_view.cc +++ b/chrome/browser/ui/views/extensions/extension_view.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/extensions/extension_view.h" +#include "chrome/browser/ui/views/extensions/extension_view.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" -#include "chrome/browser/views/extensions/extension_popup.h" +#include "chrome/browser/ui/views/extensions/extension_popup.h" #include "views/widget/widget.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc index 1155770..30aa4d8 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.cc +++ b/chrome/browser/ui/views/external_protocol_dialog.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/external_protocol_dialog.h" +#include "chrome/browser/ui/views/external_protocol_dialog.h" #include "app/l10n_util.h" #include "app/message_box_flags.h" diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index f54ba6c..ba2de8e 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/find_bar_host.h" +#include "chrome/browser/ui/views/find_bar_host.h" #include "app/keyboard_codes.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/ui/views/find_bar_host.h b/chrome/browser/ui/views/find_bar_host.h index 997d2f8..1dbe4df 100644 --- a/chrome/browser/ui/views/find_bar_host.h +++ b/chrome/browser/ui/views/find_bar_host.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/ui/find_bar/find_bar.h" -#include "chrome/browser/views/dropdown_bar_host.h" +#include "chrome/browser/ui/views/dropdown_bar_host.h" #include "gfx/native_widget_types.h" #include "gfx/rect.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/find_bar_host_gtk.cc b/chrome/browser/ui/views/find_bar_host_gtk.cc index 7306361..4f2f4ae 100644 --- a/chrome/browser/ui/views/find_bar_host_gtk.cc +++ b/chrome/browser/ui/views/find_bar_host_gtk.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/find_bar_host.h" +#include "chrome/browser/ui/views/find_bar_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/tab_contents/tab_contents_view_gtk.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.h" #include "views/widget/widget_gtk.h" void FindBarHost::AudibleAlert() { diff --git a/chrome/browser/ui/views/find_bar_host_win.cc b/chrome/browser/ui/views/find_bar_host_win.cc index d74a8d1..fb341c0 100644 --- a/chrome/browser/ui/views/find_bar_host_win.cc +++ b/chrome/browser/ui/views/find_bar_host_win.cc @@ -1,14 +1,14 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/find_bar_host.h" +#include "chrome/browser/ui/views/find_bar_host.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "views/controls/scrollbar/native_scroll_bar.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 4a98ec4..cf2b359 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/find_bar_view.h" +#include "chrome/browser/ui/views/find_bar_view.h" #include <algorithm> diff --git a/chrome/browser/ui/views/find_bar_view.h b/chrome/browser/ui/views/find_bar_view.h index e3ef231..b535e02 100644 --- a/chrome/browser/ui/views/find_bar_view.h +++ b/chrome/browser/ui/views/find_bar_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/string16.h" #include "chrome/browser/ui/find_bar/find_notification_details.h" -#include "chrome/browser/views/dropdown_bar_view.h" +#include "chrome/browser/ui/views/dropdown_bar_view.h" #include "gfx/size.h" #include "views/controls/button/button.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc index 8fe3cd4..bf70f64 100644 --- a/chrome/browser/ui/views/first_run_bubble.cc +++ b/chrome/browser/ui/views/first_run_bubble.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/first_run_bubble.h" +#include "chrome/browser/ui/views/first_run_bubble.h" #include "app/gfx/font_util.h" #include "app/l10n_util.h" diff --git a/chrome/browser/ui/views/first_run_bubble.h b/chrome/browser/ui/views/first_run_bubble.h index 2829218..cf6da71 100644 --- a/chrome/browser/ui/views/first_run_bubble.h +++ b/chrome/browser/ui/views/first_run_bubble.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/task.h" #include "chrome/browser/first_run/first_run.h" -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" class FirstRunBubbleViewBase; class Profile; diff --git a/chrome/browser/ui/views/first_run_search_engine_view.cc b/chrome/browser/ui/views/first_run_search_engine_view.cc index 91cf367..0cc0060 100644 --- a/chrome/browser/ui/views/first_run_search_engine_view.cc +++ b/chrome/browser/ui/views/first_run_search_engine_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/first_run_search_engine_view.h" +#include "chrome/browser/ui/views/first_run_search_engine_view.h" #include <algorithm> #include <map> diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc index fdfff0a..a349dfb 100644 --- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc @@ -1,16 +1,16 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/frame/app_panel_browser_frame_view.h" +#include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/frame/browser_frame.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_frame.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "gfx/canvas.h" #include "gfx/font.h" #include "gfx/path.h" diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h index 1f6deec..d5173d4 100644 --- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h +++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_ #pragma once -#include "chrome/browser/views/frame/browser_frame.h" -#include "chrome/browser/views/frame/browser_non_client_frame_view.h" -#include "chrome/browser/views/tab_icon_view.h" +#include "chrome/browser/ui/views/frame/browser_frame.h" +#include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" +#include "chrome/browser/ui/views/tab_icon_view.h" #include "views/controls/button/button.h" #include "views/window/non_client_view.h" diff --git a/chrome/browser/ui/views/frame/browser_bubble_host.cc b/chrome/browser/ui/views/frame/browser_bubble_host.cc index 60809bf..ed13309 100644 --- a/chrome/browser/ui/views/frame/browser_bubble_host.cc +++ b/chrome/browser/ui/views/frame/browser_bubble_host.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/frame/browser_bubble_host.h" +#include "chrome/browser/ui/views/frame/browser_bubble_host.h" #include "base/logging.h" -#include "chrome/browser/views/browser_bubble.h" +#include "chrome/browser/ui/views/browser_bubble.h" void BrowserBubbleHost::WindowMoved() { // Do safe iteration in case the bubble winds up closing as a result of this diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.cc b/chrome/browser/ui/views/frame/browser_frame_gtk.cc index f092657..215e50c 100644 --- a/chrome/browser/ui/views/frame/browser_frame_gtk.cc +++ b/chrome/browser/ui/views/frame/browser_frame_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/frame/browser_frame_gtk.h" +#include "chrome/browser/ui/views/frame/browser_frame_gtk.h" #include "base/logging.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.h b/chrome/browser/ui/views/frame/browser_frame_gtk.h index e49227f..d7d0ca3 100644 --- a/chrome/browser/ui/views/frame/browser_frame_gtk.h +++ b/chrome/browser/ui/views/frame/browser_frame_gtk.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "chrome/browser/views/frame/browser_frame.h" +#include "chrome/browser/ui/views/frame/browser_frame.h" #include "views/window/window_gtk.h" class BrowserNonClientFrameView; diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc index f1ef85d..9fe26b6 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/frame/browser_frame_win.h" +#include "chrome/browser/ui/views/frame/browser_frame_win.h" #include <dwmapi.h> #include <shellapi.h> @@ -15,10 +15,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/themes/browser_theme_provider.h" -#include "chrome/browser/views/frame/browser_non_client_frame_view.h" -#include "chrome/browser/views/frame/browser_root_view.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/frame/glass_browser_frame_view.h" +#include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" +#include "chrome/browser/ui/views/frame/browser_root_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" #include "gfx/font.h" #include "grit/theme_resources.h" #include "views/screen.h" diff --git a/chrome/browser/ui/views/frame/browser_frame_win.h b/chrome/browser/ui/views/frame/browser_frame_win.h index a74eae2..69d14a3 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.h +++ b/chrome/browser/ui/views/frame/browser_frame_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "chrome/browser/views/frame/browser_frame.h" +#include "chrome/browser/ui/views/frame/browser_frame.h" #include "views/window/window_win.h" class AeroGlassNonClientView; diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc index b6de9d6..94c2b47 100644 --- a/chrome/browser/ui/views/frame/browser_root_view.cc +++ b/chrome/browser/ui/views/frame/browser_root_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/frame/browser_root_view.h" +#include "chrome/browser/ui/views/frame/browser_root_view.h" #include "app/drag_drop_types.h" #include "app/l10n_util.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index ffbf069..8c912db 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.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/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #if defined(OS_LINUX) #include <gtk/gtk.h> @@ -88,7 +88,7 @@ #include "chrome/browser/aeropeek_manager.h" #include "chrome/browser/jumplist_win.h" #elif defined(OS_LINUX) -#include "chrome/browser/views/accelerator_table_gtk.h" +#include "chrome/browser/ui/views/accelerator_table_gtk.h" #include "views/window/hit_test.h" #include "views/window/window_gtk.h" #endif @@ -123,7 +123,7 @@ static const int kNewtabBarRoundness = 5; // ------------ // Returned from BrowserView::GetClassName. -const char BrowserView::kViewClassName[] = "browser/views/BrowserView"; +const char BrowserView::kViewClassName[] = "browser/ui/views/BrowserView"; #if defined(OS_CHROMEOS) // Get a normal browser window of given |profile| to use as dialog parent diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index 3a570ee..c40f06b 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -17,13 +17,13 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/frame/browser_bubble_host.h" -#include "chrome/browser/views/frame/browser_frame.h" -#include "chrome/browser/views/infobars/infobar_container.h" -#include "chrome/browser/views/tab_contents/tab_contents_container.h" -#include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/browser/views/tabs/base_tab_strip.h" -#include "chrome/browser/views/unhandled_keyboard_event_handler.h" +#include "chrome/browser/ui/views/frame/browser_bubble_host.h" +#include "chrome/browser/ui/views/frame/browser_frame.h" +#include "chrome/browser/ui/views/infobars/infobar_container.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" +#include "chrome/browser/ui/views/tabs/tab_strip.h" +#include "chrome/browser/ui/views/tabs/base_tab_strip.h" +#include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" #include "chrome/common/notification_registrar.h" #include "gfx/native_widget_types.h" #include "views/window/client_view.h" diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc index 914f202..34549bd 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/frame/browser_view_layout.h" +#include "chrome/browser/ui/views/frame/browser_view_layout.h" #include "chrome/browser/sidebar/sidebar_manager.h" #include "chrome/browser/ui/find_bar/find_bar.h" diff --git a/chrome/browser/ui/views/frame/contents_container.cc b/chrome/browser/ui/views/frame/contents_container.cc index 1c8abfd..f35ac74 100644 --- a/chrome/browser/ui/views/frame/contents_container.cc +++ b/chrome/browser/ui/views/frame/contents_container.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/frame/contents_container.h" +#include "chrome/browser/ui/views/frame/contents_container.h" #include "base/logging.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc index fdc1956..ac12777 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -1,18 +1,18 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/frame/glass_browser_frame_view.h" +#include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/themes/browser_theme_provider.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/tabs/side_tab_strip.h" -#include "chrome/browser/views/tabs/tab.h" -#include "chrome/browser/views/tabs/tab_strip.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/tabs/side_tab_strip.h" +#include "chrome/browser/ui/views/tabs/tab.h" +#include "chrome/browser/ui/views/tabs/tab_strip.h" #include "gfx/canvas_skia.h" #include "gfx/icon_util.h" #include "grit/app_resources.h" diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.h b/chrome/browser/ui/views/frame/glass_browser_frame_view.h index c191568..2938178 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.h +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ #pragma once -#include "chrome/browser/views/frame/browser_frame_win.h" -#include "chrome/browser/views/frame/browser_non_client_frame_view.h" +#include "chrome/browser/ui/views/frame/browser_frame_win.h" +#include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" #include "views/controls/button/button.h" #include "views/window/non_client_view.h" diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 0704ebd..8d331cf 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/frame/opaque_browser_frame_view.h" +#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -11,10 +11,10 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/themes/browser_theme_provider.h" -#include "chrome/browser/views/frame/browser_frame.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/browser/views/toolbar_view.h" +#include "chrome/browser/ui/views/frame/browser_frame.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/tabs/tab_strip.h" +#include "chrome/browser/ui/views/toolbar_view.h" #include "gfx/canvas_skia.h" #include "gfx/font.h" #include "gfx/path.h" diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h index 5d27f0ce..51dd03f 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ #pragma once -#include "chrome/browser/views/frame/browser_frame.h" -#include "chrome/browser/views/frame/browser_non_client_frame_view.h" -#include "chrome/browser/views/tab_icon_view.h" +#include "chrome/browser/ui/views/frame/browser_frame.h" +#include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" +#include "chrome/browser/ui/views/tab_icon_view.h" #include "views/controls/button/button.h" #include "views/window/non_client_view.h" diff --git a/chrome/browser/ui/views/frame/popup_non_client_frame_view.cc b/chrome/browser/ui/views/frame/popup_non_client_frame_view.cc index dd76c86..e0e835d 100644 --- a/chrome/browser/ui/views/frame/popup_non_client_frame_view.cc +++ b/chrome/browser/ui/views/frame/popup_non_client_frame_view.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/frame/popup_non_client_frame_view.h" +#include "chrome/browser/ui/views/frame/popup_non_client_frame_view.h" -#include "chrome/browser/views/tabs/base_tab_strip.h" +#include "chrome/browser/ui/views/tabs/base_tab_strip.h" #include "gfx/point.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/chrome/browser/ui/views/frame/popup_non_client_frame_view.h b/chrome/browser/ui/views/frame/popup_non_client_frame_view.h index 95e13fc..4ba01db 100644 --- a/chrome/browser/ui/views/frame/popup_non_client_frame_view.h +++ b/chrome/browser/ui/views/frame/popup_non_client_frame_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_FRAME_POPUP_NON_CLIENT_FRAME_VIEW_H_ #pragma once -#include "chrome/browser/views/frame/browser_non_client_frame_view.h" +#include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" class BaseTabStrip; diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble.cc b/chrome/browser/ui/views/fullscreen_exit_bubble.cc index 6a5b421..d3f3910 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/fullscreen_exit_bubble.h" +#include "chrome/browser/ui/views/fullscreen_exit_bubble.h" #include "app/keyboard_codes.h" #include "app/l10n_util.h" diff --git a/chrome/browser/ui/views/generic_info_view.cc b/chrome/browser/ui/views/generic_info_view.cc index 7eb6d90..c748404 100644 --- a/chrome/browser/ui/views/generic_info_view.cc +++ b/chrome/browser/ui/views/generic_info_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/generic_info_view.h" +#include "chrome/browser/ui/views/generic_info_view.h" #include "app/l10n_util.h" #include "base/logging.h" diff --git a/chrome/browser/ui/views/generic_info_view_unittest.cc b/chrome/browser/ui/views/generic_info_view_unittest.cc index ba079f8..5dd9e78 100644 --- a/chrome/browser/ui/views/generic_info_view_unittest.cc +++ b/chrome/browser/ui/views/generic_info_view_unittest.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "app/l10n_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/views/generic_info_view.h" +#include "chrome/browser/ui/views/generic_info_view.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc index 2cb5cb0..dd5c50a 100644 --- a/chrome/browser/ui/views/html_dialog_view.cc +++ b/chrome/browser/ui/views/html_dialog_view.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/html_dialog_view.h" +#include "chrome/browser/ui/views/html_dialog_view.h" #include "app/keyboard_codes.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/window.h" #include "chrome/common/native_web_keyboard_event.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/html_dialog_view.h b/chrome/browser/ui/views/html_dialog_view.h index 5706c68..90d47af 100644 --- a/chrome/browser/ui/views/html_dialog_view.h +++ b/chrome/browser/ui/views/html_dialog_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,7 +10,7 @@ #include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h" -#include "chrome/browser/views/dom_view.h" +#include "chrome/browser/ui/views/dom_view.h" #include "gfx/size.h" #include "views/window/window_delegate.h" diff --git a/chrome/browser/ui/views/html_dialog_view_browsertest.cc b/chrome/browser/ui/views/html_dialog_view_browsertest.cc index a230922..43c157d 100644 --- a/chrome/browser/ui/views/html_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/html_dialog_view_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,7 +10,7 @@ #include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" -#include "chrome/browser/views/html_dialog_view.h" +#include "chrome/browser/ui/views/html_dialog_view.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/ui/views/importer_lock_view.cc b/chrome/browser/ui/views/importer_lock_view.cc index 714265c..95d9c31 100644 --- a/chrome/browser/ui/views/importer_lock_view.cc +++ b/chrome/browser/ui/views/importer_lock_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/importer_lock_view.h" +#include "chrome/browser/ui/views/importer_lock_view.h" #include "app/l10n_util.h" #include "base/message_loop.h" diff --git a/chrome/browser/ui/views/importer_view.cc b/chrome/browser/ui/views/importer_view.cc index 9af35f4..31d29d9 100644 --- a/chrome/browser/ui/views/importer_view.cc +++ b/chrome/browser/ui/views/importer_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/importer_view.h" +#include "chrome/browser/ui/views/importer_view.h" #include "app/l10n_util.h" #include "base/compiler_specific.h" diff --git a/chrome/browser/ui/views/importing_progress_view.cc b/chrome/browser/ui/views/importing_progress_view.cc index 2befd5f..582ff645 100644 --- a/chrome/browser/ui/views/importing_progress_view.cc +++ b/chrome/browser/ui/views/importing_progress_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/importing_progress_view.h" +#include "chrome/browser/ui/views/importing_progress_view.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/views/indexed_db_info_view.cc b/chrome/browser/ui/views/indexed_db_info_view.cc index a1718ef..729baa2 100644 --- a/chrome/browser/ui/views/indexed_db_info_view.cc +++ b/chrome/browser/ui/views/indexed_db_info_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/indexed_db_info_view.h" +#include "chrome/browser/ui/views/indexed_db_info_view.h" #include <algorithm> diff --git a/chrome/browser/ui/views/info_bubble.cc b/chrome/browser/ui/views/info_bubble.cc index 8d07a57..bb296f8 100644 --- a/chrome/browser/ui/views/info_bubble.cc +++ b/chrome/browser/ui/views/info_bubble.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" #include <vector> diff --git a/chrome/browser/ui/views/info_bubble.h b/chrome/browser/ui/views/info_bubble.h index 74fffb2..c11fb95 100644 --- a/chrome/browser/ui/views/info_bubble.h +++ b/chrome/browser/ui/views/info_bubble.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,7 +10,7 @@ #include "ui/base/animation/animation_delegate.h" #include "views/accelerator.h" #include "views/view.h" -#include "chrome/browser/views/bubble_border.h" +#include "chrome/browser/ui/views/bubble_border.h" #if defined(OS_WIN) #include "views/widget/widget_win.h" diff --git a/chrome/browser/ui/views/info_bubble_unittest.cc b/chrome/browser/ui/views/info_bubble_unittest.cc index 8d7f8ece..1e9c583 100644 --- a/chrome/browser/ui/views/info_bubble_unittest.cc +++ b/chrome/browser/ui/views/info_bubble_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" #include "testing/gtest/include/gtest/gtest.h" typedef testing::Test InfoBubbleTest; diff --git a/chrome/browser/ui/views/infobars/after_translate_infobar.cc b/chrome/browser/ui/views/infobars/after_translate_infobar.cc index 63b6c8a..69f04f8 100644 --- a/chrome/browser/ui/views/infobars/after_translate_infobar.cc +++ b/chrome/browser/ui/views/infobars/after_translate_infobar.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/infobars/after_translate_infobar.h" +#include "chrome/browser/ui/views/infobars/after_translate_infobar.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/translate/options_menu_model.h" #include "chrome/browser/translate/translate_infobar_delegate.h" -#include "chrome/browser/views/infobars/infobar_button_border.h" -#include "chrome/browser/views/infobars/infobar_text_button.h" +#include "chrome/browser/ui/views/infobars/infobar_button_border.h" +#include "chrome/browser/ui/views/infobars/infobar_text_button.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "views/controls/button/menu_button.h" diff --git a/chrome/browser/ui/views/infobars/after_translate_infobar.h b/chrome/browser/ui/views/infobars/after_translate_infobar.h index 18c74a7..0ee237a 100644 --- a/chrome/browser/ui/views/infobars/after_translate_infobar.h +++ b/chrome/browser/ui/views/infobars/after_translate_infobar.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include "chrome/browser/translate/languages_menu_model.h" #include "chrome/browser/translate/options_menu_model.h" #include "chrome/browser/translate/translate_infobar_view.h" -#include "chrome/browser/views/infobars/translate_infobar_base.h" +#include "chrome/browser/ui/views/infobars/translate_infobar_base.h" #include "views/controls/button/button.h" #include "views/controls/link.h" #include "views/controls/menu/view_menu_delegate.h" diff --git a/chrome/browser/ui/views/infobars/before_translate_infobar.cc b/chrome/browser/ui/views/infobars/before_translate_infobar.cc index f4d636a..c8dc84c 100644 --- a/chrome/browser/ui/views/infobars/before_translate_infobar.cc +++ b/chrome/browser/ui/views/infobars/before_translate_infobar.cc @@ -1,14 +1,14 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/infobars/before_translate_infobar.h" +#include "chrome/browser/ui/views/infobars/before_translate_infobar.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/translate/options_menu_model.h" #include "chrome/browser/translate/translate_infobar_delegate.h" -#include "chrome/browser/views/infobars/infobar_text_button.h" +#include "chrome/browser/ui/views/infobars/infobar_text_button.h" #include "grit/generated_resources.h" #include "views/controls/button/menu_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/infobars/before_translate_infobar.h b/chrome/browser/ui/views/infobars/before_translate_infobar.h index 52ba882..8e4e9dde 100644 --- a/chrome/browser/ui/views/infobars/before_translate_infobar.h +++ b/chrome/browser/ui/views/infobars/before_translate_infobar.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,8 +9,8 @@ #include "chrome/browser/translate/languages_menu_model.h" #include "chrome/browser/translate/options_menu_model.h" #include "chrome/browser/translate/translate_infobar_view.h" -#include "chrome/browser/views/infobars/infobars.h" -#include "chrome/browser/views/infobars/translate_infobar_base.h" +#include "chrome/browser/ui/views/infobars/infobars.h" +#include "chrome/browser/ui/views/infobars/translate_infobar_base.h" #include "views/controls/button/button.h" #include "views/controls/link.h" #include "views/controls/menu/view_menu_delegate.h" diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc index 9540b5d..56a610c 100644 --- a/chrome/browser/ui/views/infobars/extension_infobar.cc +++ b/chrome/browser/ui/views/infobars/extension_infobar.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/infobars/extension_infobar.h" +#include "chrome/browser/ui/views/infobars/extension_infobar.h" #include "app/resource_bundle.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/extensions/extension_infobar_delegate.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/platform_util.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_resource.h" diff --git a/chrome/browser/ui/views/infobars/extension_infobar.h b/chrome/browser/ui/views/infobars/extension_infobar.h index 71cfa0a..9a0b7b9 100644 --- a/chrome/browser/ui/views/infobars/extension_infobar.h +++ b/chrome/browser/ui/views/infobars/extension_infobar.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,11 +6,11 @@ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_ #pragma once -#include "chrome/browser/views/infobars/infobars.h" +#include "chrome/browser/ui/views/infobars/infobars.h" #include "chrome/browser/extensions/extension_infobar_delegate.h" #include "chrome/browser/extensions/image_loading_tracker.h" -#include "chrome/browser/views/extensions/extension_view.h" +#include "chrome/browser/ui/views/extensions/extension_view.h" #include "views/controls/menu/view_menu_delegate.h" class ExtensionContextMenuModel; diff --git a/chrome/browser/ui/views/infobars/infobar_button_border.cc b/chrome/browser/ui/views/infobars/infobar_button_border.cc index ed65885..ef69d71 100644 --- a/chrome/browser/ui/views/infobars/infobar_button_border.cc +++ b/chrome/browser/ui/views/infobars/infobar_button_border.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/infobars/infobar_button_border.h" +#include "chrome/browser/ui/views/infobars/infobar_button_border.h" #include "app/resource_bundle.h" #include "gfx/canvas.h" diff --git a/chrome/browser/ui/views/infobars/infobar_container.cc b/chrome/browser/ui/views/infobars/infobar_container.cc index e9706ff..1b7dd33 100644 --- a/chrome/browser/ui/views/infobars/infobar_container.cc +++ b/chrome/browser/ui/views/infobars/infobar_container.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/infobars/infobar_container.h" +#include "chrome/browser/ui/views/infobars/infobar_container.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/views/infobars/infobar_container.h b/chrome/browser/ui/views/infobars/infobar_container.h index c3a48fb..0acdd4f 100644 --- a/chrome/browser/ui/views/infobars/infobar_container.h +++ b/chrome/browser/ui/views/infobars/infobar_container.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_ #pragma once -#include "chrome/browser/views/accessible_pane_view.h" +#include "chrome/browser/ui/views/accessible_pane_view.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "views/view.h" diff --git a/chrome/browser/ui/views/infobars/infobar_text_button.cc b/chrome/browser/ui/views/infobars/infobar_text_button.cc index ebf5d22..ec1803d 100644 --- a/chrome/browser/ui/views/infobars/infobar_text_button.cc +++ b/chrome/browser/ui/views/infobars/infobar_text_button.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/infobars/infobar_text_button.h" +#include "chrome/browser/ui/views/infobars/infobar_text_button.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/views/infobars/infobar_button_border.h" +#include "chrome/browser/ui/views/infobars/infobar_button_border.h" // static InfoBarTextButton* InfoBarTextButton::Create(views::ButtonListener* listener, diff --git a/chrome/browser/ui/views/infobars/infobars.cc b/chrome/browser/ui/views/infobars/infobars.cc index 00504f0..f5e7604 100644 --- a/chrome/browser/ui/views/infobars/infobars.cc +++ b/chrome/browser/ui/views/infobars/infobars.cc @@ -1,16 +1,16 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/infobars/infobars.h" +#include "chrome/browser/ui/views/infobars/infobars.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/views/event_utils.h" -#include "chrome/browser/views/infobars/infobar_container.h" -#include "chrome/browser/views/infobars/infobar_text_button.h" +#include "chrome/browser/ui/views/event_utils.h" +#include "chrome/browser/ui/views/infobars/infobar_container.h" +#include "chrome/browser/ui/views/infobars/infobar_text_button.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/views/infobars/translate_infobar_base.cc b/chrome/browser/ui/views/infobars/translate_infobar_base.cc index fec6886..728c973 100644 --- a/chrome/browser/ui/views/infobars/translate_infobar_base.cc +++ b/chrome/browser/ui/views/infobars/translate_infobar_base.cc @@ -1,16 +1,16 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/infobars/translate_infobar_base.h" +#include "chrome/browser/ui/views/infobars/translate_infobar_base.h" #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/translate/translate_infobar_delegate.h" -#include "chrome/browser/views/infobars/after_translate_infobar.h" -#include "chrome/browser/views/infobars/before_translate_infobar.h" -#include "chrome/browser/views/infobars/translate_message_infobar.h" -#include "chrome/browser/views/infobars/infobar_button_border.h" +#include "chrome/browser/ui/views/infobars/after_translate_infobar.h" +#include "chrome/browser/ui/views/infobars/before_translate_infobar.h" +#include "chrome/browser/ui/views/infobars/translate_message_infobar.h" +#include "chrome/browser/ui/views/infobars/infobar_button_border.h" #include "gfx/canvas_skia.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" diff --git a/chrome/browser/ui/views/infobars/translate_infobar_base.h b/chrome/browser/ui/views/infobars/translate_infobar_base.h index 3f49c01..5bde594 100644 --- a/chrome/browser/ui/views/infobars/translate_infobar_base.h +++ b/chrome/browser/ui/views/infobars/translate_infobar_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/translate/translate_infobar_view.h" -#include "chrome/browser/views/infobars/infobars.h" +#include "chrome/browser/ui/views/infobars/infobars.h" class TranslateInfoBarDelegate; diff --git a/chrome/browser/ui/views/infobars/translate_message_infobar.cc b/chrome/browser/ui/views/infobars/translate_message_infobar.cc index 8094d4e..f398289 100644 --- a/chrome/browser/ui/views/infobars/translate_message_infobar.cc +++ b/chrome/browser/ui/views/infobars/translate_message_infobar.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/infobars/translate_message_infobar.h" +#include "chrome/browser/ui/views/infobars/translate_message_infobar.h" #include "chrome/browser/translate/translate_infobar_delegate.h" -#include "chrome/browser/views/infobars/infobar_text_button.h" +#include "chrome/browser/ui/views/infobars/infobar_text_button.h" #include "views/controls/image_view.h" TranslateMessageInfoBar::TranslateMessageInfoBar( diff --git a/chrome/browser/ui/views/infobars/translate_message_infobar.h b/chrome/browser/ui/views/infobars/translate_message_infobar.h index b809c15..6f5fa72 100644 --- a/chrome/browser/ui/views/infobars/translate_message_infobar.h +++ b/chrome/browser/ui/views/infobars/translate_message_infobar.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_TRANSLATE_MESSAGE_INFOBAR_H_ #pragma once -#include "chrome/browser/views/infobars/translate_infobar_base.h" +#include "chrome/browser/ui/views/infobars/translate_infobar_base.h" class InfoBarTextButton; diff --git a/chrome/browser/ui/views/instant_confirm_view.cc b/chrome/browser/ui/views/instant_confirm_view.cc index cd338d2..a221210 100644 --- a/chrome/browser/ui/views/instant_confirm_view.cc +++ b/chrome/browser/ui/views/instant_confirm_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/instant_confirm_view.h" +#include "chrome/browser/ui/views/instant_confirm_view.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index a75d922..429b442 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/js_modal_dialog_views.h" +#include "chrome/browser/ui/views/js_modal_dialog_views.h" #include "app/keyboard_codes.h" #include "app/l10n_util.h" #include "app/message_box_flags.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/window.h" #include "grit/generated_resources.h" #include "views/controls/message_box_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/keyword_editor_view.cc b/chrome/browser/ui/views/keyword_editor_view.cc index bd2c820..2899495 100644 --- a/chrome/browser/ui/views/keyword_editor_view.cc +++ b/chrome/browser/ui/views/keyword_editor_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/keyword_editor_view.h" +#include "chrome/browser/ui/views/keyword_editor_view.h" #include <vector> @@ -15,8 +15,8 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/search_engines/template_url_table_model.h" -#include "chrome/browser/views/browser_dialogs.h" -#include "chrome/browser/views/first_run_search_engine_view.h" +#include "chrome/browser/ui/views/browser_dialogs.h" +#include "chrome/browser/ui/views/first_run_search_engine_view.h" #include "chrome/common/pref_names.h" #include "gfx/point.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/views/local_storage_info_view.cc b/chrome/browser/ui/views/local_storage_info_view.cc index b21b74e..e2cee49 100644 --- a/chrome/browser/ui/views/local_storage_info_view.cc +++ b/chrome/browser/ui/views/local_storage_info_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/local_storage_info_view.h" +#include "chrome/browser/ui/views/local_storage_info_view.h" #include <algorithm> diff --git a/chrome/browser/ui/views/local_storage_set_item_info_view.cc b/chrome/browser/ui/views/local_storage_set_item_info_view.cc index 24b2d75..f4752d4 100644 --- a/chrome/browser/ui/views/local_storage_set_item_info_view.cc +++ b/chrome/browser/ui/views/local_storage_set_item_info_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/local_storage_set_item_info_view.h" +#include "chrome/browser/ui/views/local_storage_set_item_info_view.h" #include <algorithm> diff --git a/chrome/browser/ui/views/location_bar/click_handler.cc b/chrome/browser/ui/views/location_bar/click_handler.cc index 38002ff..63082cb 100644 --- a/chrome/browser/ui/views/location_bar/click_handler.cc +++ b/chrome/browser/ui/views/location_bar/click_handler.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/location_bar/click_handler.h" +#include "chrome/browser/ui/views/location_bar/click_handler.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h index 3281a38..0de0c8f 100644 --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "base/string16.h" -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" #include "chrome/common/content_settings_types.h" #include "ui/base/animation/linear_animation.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/location_bar/ev_bubble_view.cc b/chrome/browser/ui/views/location_bar/ev_bubble_view.cc index 215ad51..4687c63 100644 --- a/chrome/browser/ui/views/location_bar/ev_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/ev_bubble_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/location_bar/ev_bubble_view.h" +#include "chrome/browser/ui/views/location_bar/ev_bubble_view.h" EVBubbleView::EVBubbleView(const int background_images[], int contained_image, diff --git a/chrome/browser/ui/views/location_bar/ev_bubble_view.h b/chrome/browser/ui/views/location_bar/ev_bubble_view.h index d80d98f..0dc33cc 100644 --- a/chrome/browser/ui/views/location_bar/ev_bubble_view.h +++ b/chrome/browser/ui/views/location_bar/ev_bubble_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_EV_BUBBLE_VIEW_H_ #pragma once -#include "chrome/browser/views/location_bar/click_handler.h" -#include "chrome/browser/views/location_bar/icon_label_bubble_view.h" +#include "chrome/browser/ui/views/location_bar/click_handler.h" +#include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h" class LocationBarView; diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc index 1e0159b..696f733 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/location_bar/icon_label_bubble_view.h" +#include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h" #include "app/resource_bundle.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "gfx/canvas.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc index 7b757e8..305279c 100644 --- a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc +++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/location_bar/keyword_hint_view.h" +#include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index cc7b76a..e7906c7 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #if defined(OS_LINUX) #include <gtk/gtk.h> @@ -49,7 +49,7 @@ #if defined(OS_WIN) #include "chrome/browser/ui/views/location_bar/suggested_text_view.h" -#include "chrome/browser/views/first_run_bubble.h" +#include "chrome/browser/ui/views/first_run_bubble.h" #endif using views::View; @@ -69,7 +69,7 @@ const int LocationBarView::kExtensionItemPadding = 5; const int LocationBarView::kEdgeItemPadding = kItemPadding; const int LocationBarView::kBubblePadding = 1; const char LocationBarView::kViewClassName[] = - "browser/views/location_bar/LocationBarView"; + "browser/ui/views/location_bar/LocationBarView"; static const int kEVBubbleBackgroundImages[] = { IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L, diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h index 1ffa5b1..15bb586 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,7 +16,7 @@ #include "chrome/browser/search_engines/template_url_model_observer.h" #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" -#include "chrome/browser/views/extensions/extension_popup.h" +#include "chrome/browser/ui/views/extensions/extension_popup.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "gfx/font.h" diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc index b862559..3319676 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view.cc +++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/location_bar/location_icon_view.h" +#include "chrome/browser/ui/views/location_bar/location_icon_view.h" LocationIconView::LocationIconView(const LocationBarView* location_bar) : ALLOW_THIS_IN_INITIALIZER_LIST(click_handler_(this, location_bar)) { diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.h b/chrome/browser/ui/views/location_bar/location_icon_view.h index 02813c5..7bc9c9d 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view.h +++ b/chrome/browser/ui/views/location_bar/location_icon_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_ #pragma once -#include "chrome/browser/views/location_bar/click_handler.h" +#include "chrome/browser/ui/views/location_bar/click_handler.h" #include "views/controls/image_view.h" class LocationBarView; diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc index 3483095..1156a6d 100644 --- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc +++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/location_bar/page_action_image_view.h" +#include "chrome/browser/ui/views/location_bar/page_action_image_view.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/extensions/extension_browser_event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/platform_util.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_resource.h" diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.h b/chrome/browser/ui/views/location_bar/page_action_image_view.h index c7b9851..ed0f190 100644 --- a/chrome/browser/ui/views/location_bar/page_action_image_view.h +++ b/chrome/browser/ui/views/location_bar/page_action_image_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,7 +12,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/extensions/extension_context_menu_model.h" -#include "chrome/browser/views/extensions/extension_popup.h" +#include "chrome/browser/ui/views/extensions/extension_popup.h" #include "views/controls/image_view.h" class LocationBarView; diff --git a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc index fd2204e..75cc136 100644 --- a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc +++ b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/location_bar/page_action_with_badge_view.h" +#include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h" -#include "chrome/browser/views/location_bar/page_action_image_view.h" +#include "chrome/browser/ui/views/location_bar/page_action_image_view.h" #include "chrome/common/extensions/extension.h" PageActionWithBadgeView::PageActionWithBadgeView( diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc index bf133b9..7ca3b03c 100644 --- a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc +++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/location_bar/selected_keyword_view.h" +#include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" #include "app/l10n_util.h" #include "base/logging.h" diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.h b/chrome/browser/ui/views/location_bar/selected_keyword_view.h index 3e274ce..a3f8266 100644 --- a/chrome/browser/ui/views/location_bar/selected_keyword_view.h +++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <string> -#include "chrome/browser/views/location_bar/icon_label_bubble_view.h" +#include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h" #include "views/controls/label.h" class Profile; diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index f806037..a52b1b6 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/location_bar/star_view.h" +#include "chrome/browser/ui/views/location_bar/star_view.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/ui/views/location_bar/star_view.h b/chrome/browser/ui/views/location_bar/star_view.h index 2ea7b35..ad02f9e 100644 --- a/chrome/browser/ui/views/location_bar/star_view.h +++ b/chrome/browser/ui/views/location_bar/star_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_STAR_VIEW_H_ #pragma once -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" #include "views/controls/image_view.h" class CommandUpdater; diff --git a/chrome/browser/ui/views/login_view.cc b/chrome/browser/ui/views/login_view.cc index a7e4e40..9dc7450 100644 --- a/chrome/browser/ui/views/login_view.cc +++ b/chrome/browser/ui/views/login_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/login_view.h" +#include "chrome/browser/ui/views/login_view.h" #include <string> diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index 43ed162..92bfd9e 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/notifications/balloon_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/notifications/balloon_view.h" +#include "chrome/browser/ui/views/notifications/balloon_view.h" #include <vector> @@ -18,8 +18,8 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/themes/browser_theme_provider.h" -#include "chrome/browser/views/bubble_border.h" -#include "chrome/browser/views/notifications/balloon_view_host.h" +#include "chrome/browser/ui/views/bubble_border.h" +#include "chrome/browser/ui/views/notifications/balloon_view_host.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/ui/views/notifications/balloon_view.h b/chrome/browser/ui/views/notifications/balloon_view.h index a551f5a..3fe0996 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.h +++ b/chrome/browser/ui/views/notifications/balloon_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,7 +12,7 @@ #include "base/scoped_ptr.h" #include "base/task.h" #include "chrome/browser/notifications/balloon.h" -#include "chrome/browser/views/notifications/balloon_view_host.h" +#include "chrome/browser/ui/views/notifications/balloon_view_host.h" #include "chrome/common/notification_registrar.h" #include "gfx/path.h" #include "gfx/point.h" diff --git a/chrome/browser/ui/views/notifications/balloon_view_host.cc b/chrome/browser/ui/views/notifications/balloon_view_host.cc index eb9cb20..fcdbadf 100644 --- a/chrome/browser/ui/views/notifications/balloon_view_host.cc +++ b/chrome/browser/ui/views/notifications/balloon_view_host.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/notifications/balloon_view_host.h" +#include "chrome/browser/ui/views/notifications/balloon_view_host.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc index 6314525..32c29cc 100644 --- a/chrome/browser/ui/views/options/advanced_contents_view.cc +++ b/chrome/browser/ui/views/options/advanced_contents_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/advanced_contents_view.h" +#include "chrome/browser/ui/views/options/advanced_contents_view.h" #include <windows.h> diff --git a/chrome/browser/ui/views/options/advanced_contents_view.h b/chrome/browser/ui/views/options/advanced_contents_view.h index 7671e9b..eda31a0 100644 --- a/chrome/browser/ui/views/options/advanced_contents_view.h +++ b/chrome/browser/ui/views/options/advanced_contents_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_OPTIONS_ADVANCED_CONTENTS_VIEW_H__ #pragma once -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" class AdvancedContentsView; namespace views { diff --git a/chrome/browser/ui/views/options/advanced_page_view.cc b/chrome/browser/ui/views/options/advanced_page_view.cc index 62f8660..128d71a 100644 --- a/chrome/browser/ui/views/options/advanced_page_view.cc +++ b/chrome/browser/ui/views/options/advanced_page_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/advanced_page_view.h" +#include "chrome/browser/ui/views/options/advanced_page_view.h" #include "app/l10n_util.h" #include "app/message_box_flags.h" diff --git a/chrome/browser/ui/views/options/advanced_page_view.h b/chrome/browser/ui/views/options/advanced_page_view.h index 5769be9..90ce325 100644 --- a/chrome/browser/ui/views/options/advanced_page_view.h +++ b/chrome/browser/ui/views/options/advanced_page_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_OPTIONS_ADVANCED_PAGE_VIEW_H_ #pragma once -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" #include "views/controls/button/button.h" class AdvancedOptionsListModel; diff --git a/chrome/browser/ui/views/options/content_exceptions_table_view.cc b/chrome/browser/ui/views/options/content_exceptions_table_view.cc index 1b81aa1..4bfdc88 100644 --- a/chrome/browser/ui/views/options/content_exceptions_table_view.cc +++ b/chrome/browser/ui/views/options/content_exceptions_table_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/content_exceptions_table_view.h" +#include "chrome/browser/ui/views/options/content_exceptions_table_view.h" #include "gfx/font.h" diff --git a/chrome/browser/ui/views/options/content_filter_page_view.cc b/chrome/browser/ui/views/options/content_filter_page_view.cc index 919ccbb..ce5dbdd 100644 --- a/chrome/browser/ui/views/options/content_filter_page_view.cc +++ b/chrome/browser/ui/views/options/content_filter_page_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/content_filter_page_view.h" +#include "chrome/browser/ui/views/options/content_filter_page_view.h" #include "app/l10n_util.h" #include "base/command_line.h" @@ -14,8 +14,8 @@ #include "chrome/browser/notifications/notification_exceptions_table_model.h" #include "chrome/browser/plugin_exceptions_table_model.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/views/options/exceptions_view.h" -#include "chrome/browser/views/options/simple_content_exceptions_view.h" +#include "chrome/browser/ui/views/options/exceptions_view.h" +#include "chrome/browser/ui/views/options/simple_content_exceptions_view.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/ui/views/options/content_filter_page_view.h b/chrome/browser/ui/views/options/content_filter_page_view.h index 5f23583..eff5899 100644 --- a/chrome/browser/ui/views/options/content_filter_page_view.h +++ b/chrome/browser/ui/views/options/content_filter_page_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/notification_registrar.h" #include "views/controls/button/button.h" diff --git a/chrome/browser/ui/views/options/content_page_view.cc b/chrome/browser/ui/views/options/content_page_view.cc index 7bdba35..a594007be 100644 --- a/chrome/browser/ui/views/options/content_page_view.cc +++ b/chrome/browser/ui/views/options/content_page_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/content_page_view.h" +#include "chrome/browser/ui/views/options/content_page_view.h" #include <windows.h> #include <shlobj.h> @@ -21,10 +21,10 @@ #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/browser/sync/sync_setup_wizard.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/importer_view.h" -#include "chrome/browser/views/options/managed_prefs_banner_view.h" -#include "chrome/browser/views/options/options_group_view.h" -#include "chrome/browser/views/options/passwords_exceptions_window_view.h" +#include "chrome/browser/ui/views/importer_view.h" +#include "chrome/browser/ui/views/options/managed_prefs_banner_view.h" +#include "chrome/browser/ui/views/options/options_group_view.h" +#include "chrome/browser/ui/views/options/passwords_exceptions_window_view.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "gfx/canvas.h" diff --git a/chrome/browser/ui/views/options/content_page_view.h b/chrome/browser/ui/views/options/content_page_view.h index 45a7390..d26c28f 100644 --- a/chrome/browser/ui/views/options/content_page_view.h +++ b/chrome/browser/ui/views/options/content_page_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,8 +9,8 @@ #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/browser/views/options/options_page_view.h" -#include "chrome/browser/views/confirm_message_box_dialog.h" +#include "chrome/browser/ui/views/options/options_page_view.h" +#include "chrome/browser/ui/views/confirm_message_box_dialog.h" #include "views/controls/button/button.h" #include "views/controls/link.h" #include "views/view.h" diff --git a/chrome/browser/ui/views/options/content_settings_window_view.cc b/chrome/browser/ui/views/options/content_settings_window_view.cc index eeaca4e..b9229bd 100644 --- a/chrome/browser/ui/views/options/content_settings_window_view.cc +++ b/chrome/browser/ui/views/options/content_settings_window_view.cc @@ -1,19 +1,19 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/content_settings_window_view.h" +#include "chrome/browser/ui/views/options/content_settings_window_view.h" #include "app/l10n_util.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/views/options/advanced_page_view.h" -#include "chrome/browser/views/options/content_filter_page_view.h" -#include "chrome/browser/views/options/cookie_filter_page_view.h" -#include "chrome/browser/views/options/general_page_view.h" -#include "chrome/browser/views/options/plugin_filter_page_view.h" +#include "chrome/browser/ui/views/options/advanced_page_view.h" +#include "chrome/browser/ui/views/options/content_filter_page_view.h" +#include "chrome/browser/ui/views/options/cookie_filter_page_view.h" +#include "chrome/browser/ui/views/options/general_page_view.h" +#include "chrome/browser/ui/views/options/plugin_filter_page_view.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/views/options/cookie_filter_page_view.cc b/chrome/browser/ui/views/options/cookie_filter_page_view.cc index 055a964..916bdee 100644 --- a/chrome/browser/ui/views/options/cookie_filter_page_view.cc +++ b/chrome/browser/ui/views/options/cookie_filter_page_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/cookie_filter_page_view.h" +#include "chrome/browser/ui/views/options/cookie_filter_page_view.h" #include "app/l10n_util.h" #include "chrome/browser/content_settings/host_content_settings_map.h" diff --git a/chrome/browser/ui/views/options/cookie_filter_page_view.h b/chrome/browser/ui/views/options/cookie_filter_page_view.h index 4a03723..c0d9445c 100644 --- a/chrome/browser/ui/views/options/cookie_filter_page_view.h +++ b/chrome/browser/ui/views/options/cookie_filter_page_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_OPTIONS_COOKIE_FILTER_PAGE_VIEW_H_ #pragma once -#include "chrome/browser/views/options/content_filter_page_view.h" +#include "chrome/browser/ui/views/options/content_filter_page_view.h" #include "chrome/browser/prefs/pref_member.h" diff --git a/chrome/browser/ui/views/options/cookies_view.cc b/chrome/browser/ui/views/options/cookies_view.cc index 973e11b..cf436d0 100644 --- a/chrome/browser/ui/views/options/cookies_view.cc +++ b/chrome/browser/ui/views/options/cookies_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/cookies_view.h" +#include "chrome/browser/ui/views/options/cookies_view.h" #include <algorithm> @@ -10,11 +10,11 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/views/appcache_info_view.h" -#include "chrome/browser/views/cookie_info_view.h" -#include "chrome/browser/views/database_info_view.h" -#include "chrome/browser/views/indexed_db_info_view.h" -#include "chrome/browser/views/local_storage_info_view.h" +#include "chrome/browser/ui/views/appcache_info_view.h" +#include "chrome/browser/ui/views/cookie_info_view.h" +#include "chrome/browser/ui/views/database_info_view.h" +#include "chrome/browser/ui/views/indexed_db_info_view.h" +#include "chrome/browser/ui/views/local_storage_info_view.h" #include "gfx/canvas.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/options/exception_editor_view.cc b/chrome/browser/ui/views/options/exception_editor_view.cc index d5ceaa7..2f756bf 100644 --- a/chrome/browser/ui/views/options/exception_editor_view.cc +++ b/chrome/browser/ui/views/options/exception_editor_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/exception_editor_view.h" +#include "chrome/browser/ui/views/options/exception_editor_view.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/ui/views/options/exceptions_page_view.cc b/chrome/browser/ui/views/options/exceptions_page_view.cc index 3cb7488..fd94c06 100644 --- a/chrome/browser/ui/views/options/exceptions_page_view.cc +++ b/chrome/browser/ui/views/options/exceptions_page_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/exceptions_page_view.h" +#include "chrome/browser/ui/views/options/exceptions_page_view.h" #include "app/l10n_util.h" #include "base/string_util.h" diff --git a/chrome/browser/ui/views/options/exceptions_page_view.h b/chrome/browser/ui/views/options/exceptions_page_view.h index 618b408..ee34869 100644 --- a/chrome/browser/ui/views/options/exceptions_page_view.h +++ b/chrome/browser/ui/views/options/exceptions_page_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,8 +9,8 @@ #include <vector> #include "base/compiler_specific.h" -#include "chrome/browser/views/options/options_page_view.h" -#include "chrome/browser/views/options/passwords_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/passwords_page_view.h" #include "views/controls/table/table_view_observer.h" class Profile; diff --git a/chrome/browser/ui/views/options/exceptions_view.cc b/chrome/browser/ui/views/options/exceptions_view.cc index 55de5aa..73f1b7b 100644 --- a/chrome/browser/ui/views/options/exceptions_view.cc +++ b/chrome/browser/ui/views/options/exceptions_view.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/exceptions_view.h" +#include "chrome/browser/ui/views/options/exceptions_view.h" #include <algorithm> #include <vector> #include "app/l10n_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/views/options/content_exceptions_table_view.h" +#include "chrome/browser/ui/views/options/content_exceptions_table_view.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "gfx/rect.h" diff --git a/chrome/browser/ui/views/options/exceptions_view.h b/chrome/browser/ui/views/options/exceptions_view.h index a0747be..d168685 100644 --- a/chrome/browser/ui/views/options/exceptions_view.h +++ b/chrome/browser/ui/views/options/exceptions_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include <string> #include "chrome/browser/content_exceptions_table_model.h" -#include "chrome/browser/views/options/exception_editor_view.h" +#include "chrome/browser/ui/views/options/exception_editor_view.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_types.h" #include "views/controls/button/button.h" diff --git a/chrome/browser/ui/views/options/fonts_languages_window_view.cc b/chrome/browser/ui/views/options/fonts_languages_window_view.cc index 79a146b..d53c94e 100644 --- a/chrome/browser/ui/views/options/fonts_languages_window_view.cc +++ b/chrome/browser/ui/views/options/fonts_languages_window_view.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/fonts_languages_window_view.h" +#include "chrome/browser/ui/views/options/fonts_languages_window_view.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/views/options/fonts_page_view.h" -#include "chrome/browser/views/options/languages_page_view.h" +#include "chrome/browser/ui/views/options/fonts_page_view.h" +#include "chrome/browser/ui/views/options/languages_page_view.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/views/options/fonts_page_view.cc b/chrome/browser/ui/views/options/fonts_page_view.cc index b02a27e..df6867c 100644 --- a/chrome/browser/ui/views/options/fonts_page_view.cc +++ b/chrome/browser/ui/views/options/fonts_page_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/fonts_page_view.h" +#include "chrome/browser/ui/views/options/fonts_page_view.h" #include <windows.h> #include <shlobj.h> diff --git a/chrome/browser/ui/views/options/fonts_page_view.h b/chrome/browser/ui/views/options/fonts_page_view.h index 7627aa7..83e4b8a 100644 --- a/chrome/browser/ui/views/options/fonts_page_view.h +++ b/chrome/browser/ui/views/options/fonts_page_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,7 +10,7 @@ #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" #include "views/controls/combobox/combobox.h" #include "views/controls/button/button.h" #include "views/view.h" diff --git a/chrome/browser/ui/views/options/general_page_view.cc b/chrome/browser/ui/views/options/general_page_view.cc index a0243cf..e3ad120 100644 --- a/chrome/browser/ui/views/options/general_page_view.cc +++ b/chrome/browser/ui/views/options/general_page_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/general_page_view.h" +#include "chrome/browser/ui/views/options/general_page_view.h" #include "app/combobox_model.h" #include "app/l10n_util.h" diff --git a/chrome/browser/ui/views/options/general_page_view.h b/chrome/browser/ui/views/options/general_page_view.h index 928fc42..3093d53 100644 --- a/chrome/browser/ui/views/options/general_page_view.h +++ b/chrome/browser/ui/views/options/general_page_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,8 +9,8 @@ #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/shell_integration.h" -#include "chrome/browser/views/options/options_page_view.h" -#include "chrome/browser/views/url_picker.h" +#include "chrome/browser/ui/views/options/options_page_view.h" +#include "chrome/browser/ui/views/url_picker.h" #include "views/controls/combobox/combobox.h" #include "views/controls/button/button.h" #include "views/controls/link.h" diff --git a/chrome/browser/ui/views/options/languages_page_view.cc b/chrome/browser/ui/views/options/languages_page_view.cc index afe1e84..e9594ac 100644 --- a/chrome/browser/ui/views/options/languages_page_view.cc +++ b/chrome/browser/ui/views/options/languages_page_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #include <vsstyle.h> #include <vssym32.h> -#include "chrome/browser/views/options/languages_page_view.h" +#include "chrome/browser/ui/views/options/languages_page_view.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -21,7 +21,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/browser/views/restart_message_box.h" +#include "chrome/browser/ui/views/restart_message_box.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/spellcheck_common.h" diff --git a/chrome/browser/ui/views/options/languages_page_view.h b/chrome/browser/ui/views/options/languages_page_view.h index f6a1372..57feff5 100644 --- a/chrome/browser/ui/views/options/languages_page_view.h +++ b/chrome/browser/ui/views/options/languages_page_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/prefs/pref_member.h" -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" #include "views/controls/combobox/combobox.h" #include "views/controls/button/button.h" #include "views/controls/table/table_view_observer.h" diff --git a/chrome/browser/ui/views/options/managed_prefs_banner_view.cc b/chrome/browser/ui/views/options/managed_prefs_banner_view.cc index e063d14..bda176d 100644 --- a/chrome/browser/ui/views/options/managed_prefs_banner_view.cc +++ b/chrome/browser/ui/views/options/managed_prefs_banner_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/managed_prefs_banner_view.h" +#include "chrome/browser/ui/views/options/managed_prefs_banner_view.h" #include "app/resource_bundle.h" #include "gfx/color_utils.h" diff --git a/chrome/browser/ui/views/options/options_group_view.cc b/chrome/browser/ui/views/options/options_group_view.cc index 70f88b8..205f5da 100644 --- a/chrome/browser/ui/views/options/options_group_view.cc +++ b/chrome/browser/ui/views/options/options_group_view.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include <vsstyle.h> #include <vssym32.h> -#include "chrome/browser/views/options/options_group_view.h" +#include "chrome/browser/ui/views/options/options_group_view.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/ui/views/options/options_page_view.cc b/chrome/browser/ui/views/options/options_page_view.cc index 81b1e98..108fd0c 100644 --- a/chrome/browser/ui/views/options/options_page_view.cc +++ b/chrome/browser/ui/views/options/options_page_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/options/options_page_view.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/ui/views/options/passwords_exceptions_window_view.cc b/chrome/browser/ui/views/options/passwords_exceptions_window_view.cc index c9f5c73..b281440 100644 --- a/chrome/browser/ui/views/options/passwords_exceptions_window_view.cc +++ b/chrome/browser/ui/views/options/passwords_exceptions_window_view.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/passwords_exceptions_window_view.h" +#include "chrome/browser/ui/views/options/passwords_exceptions_window_view.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/views/options/passwords_page_view.h" -#include "chrome/browser/views/options/exceptions_page_view.h" +#include "chrome/browser/ui/views/options/passwords_page_view.h" +#include "chrome/browser/ui/views/options/exceptions_page_view.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "views/controls/tabbed_pane/tabbed_pane.h" diff --git a/chrome/browser/ui/views/options/passwords_page_view.cc b/chrome/browser/ui/views/options/passwords_page_view.cc index 8e30879..8b4ea5b 100644 --- a/chrome/browser/ui/views/options/passwords_page_view.cc +++ b/chrome/browser/ui/views/options/passwords_page_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/passwords_page_view.h" +#include "chrome/browser/ui/views/options/passwords_page_view.h" #include "app/l10n_util.h" #include "base/i18n/rtl.h" diff --git a/chrome/browser/ui/views/options/passwords_page_view.h b/chrome/browser/ui/views/options/passwords_page_view.h index 39428bf..e5f7a26 100644 --- a/chrome/browser/ui/views/options/passwords_page_view.h +++ b/chrome/browser/ui/views/options/passwords_page_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,8 +16,8 @@ #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/prefs/pref_member.h" -#include "chrome/browser/views/confirm_message_box_dialog.h" -#include "chrome/browser/views/options/options_page_view.h" +#include "chrome/browser/ui/views/confirm_message_box_dialog.h" +#include "chrome/browser/ui/views/options/options_page_view.h" #include "views/controls/button/native_button.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" diff --git a/chrome/browser/ui/views/options/plugin_filter_page_view.cc b/chrome/browser/ui/views/options/plugin_filter_page_view.cc index b527960..e8e3ddf 100644 --- a/chrome/browser/ui/views/options/plugin_filter_page_view.cc +++ b/chrome/browser/ui/views/options/plugin_filter_page_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/plugin_filter_page_view.h" +#include "chrome/browser/ui/views/options/plugin_filter_page_view.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/views/options/plugin_filter_page_view.h b/chrome/browser/ui/views/options/plugin_filter_page_view.h index f874774..6a1d441 100644 --- a/chrome/browser/ui/views/options/plugin_filter_page_view.h +++ b/chrome/browser/ui/views/options/plugin_filter_page_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_OPTIONS_PLUGIN_FILTER_PAGE_VIEW_H_ #pragma once -#include "chrome/browser/views/options/content_filter_page_view.h" +#include "chrome/browser/ui/views/options/content_filter_page_view.h" //////////////////////////////////////////////////////////////////////////////// // PluginFilterPageView class is used to render the plugin content settings tab. diff --git a/chrome/browser/ui/views/options/simple_content_exceptions_view.cc b/chrome/browser/ui/views/options/simple_content_exceptions_view.cc index 51be466..c5002ab 100644 --- a/chrome/browser/ui/views/options/simple_content_exceptions_view.cc +++ b/chrome/browser/ui/views/options/simple_content_exceptions_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/options/simple_content_exceptions_view.h" +#include "chrome/browser/ui/views/options/simple_content_exceptions_view.h" #include <algorithm> #include <vector> diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc index d872399..fb974ab 100644 --- a/chrome/browser/ui/views/page_info_bubble_view.cc +++ b/chrome/browser/ui/views/page_info_bubble_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/page_info_bubble_view.h" +#include "chrome/browser/ui/views/page_info_bubble_view.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" @@ -10,9 +10,9 @@ #include "chrome/browser/cert_store.h" #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/info_bubble.h" -#include "chrome/browser/views/toolbar_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/info_bubble.h" +#include "chrome/browser/ui/views/toolbar_view.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/views/page_info_bubble_view.h b/chrome/browser/ui/views/page_info_bubble_view.h index fc2917b..0f57d5a 100644 --- a/chrome/browser/ui/views/page_info_bubble_view.h +++ b/chrome/browser/ui/views/page_info_bubble_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/page_info_model.h" -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" #include "views/controls/link.h" diff --git a/chrome/browser/ui/views/pinned_contents_info_bubble.cc b/chrome/browser/ui/views/pinned_contents_info_bubble.cc index c064c16..90074f7 100644 --- a/chrome/browser/ui/views/pinned_contents_info_bubble.cc +++ b/chrome/browser/ui/views/pinned_contents_info_bubble.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/pinned_contents_info_bubble.h" +#include "chrome/browser/ui/views/pinned_contents_info_bubble.h" -#include "chrome/browser/views/bubble_border.h" +#include "chrome/browser/ui/views/bubble_border.h" void PinnedContentsBorderContents::SizeAndGetBounds( const gfx::Rect& position_relative_to, diff --git a/chrome/browser/ui/views/pinned_contents_info_bubble.h b/chrome/browser/ui/views/pinned_contents_info_bubble.h index d1070b6..cdf4ed5 100644 --- a/chrome/browser/ui/views/pinned_contents_info_bubble.h +++ b/chrome/browser/ui/views/pinned_contents_info_bubble.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_PINNED_CONTENTS_INFO_BUBBLE_H_ #pragma once -#include "chrome/browser/views/info_bubble.h" +#include "chrome/browser/ui/views/info_bubble.h" // This is a specialization of BorderContents, used to draw a border around // an InfoBubble that has its contents pinned to a specific location. See diff --git a/chrome/browser/ui/views/reload_button.cc b/chrome/browser/ui/views/reload_button.cc index 0df1030..5a2b5bce 100644 --- a/chrome/browser/ui/views/reload_button.cc +++ b/chrome/browser/ui/views/reload_button.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/reload_button.h" +#include "chrome/browser/ui/views/reload_button.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/event_utils.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/event_utils.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "grit/generated_resources.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/views/reload_button_unittest.cc b/chrome/browser/ui/views/reload_button_unittest.cc index 5f8255b..db0d616 100644 --- a/chrome/browser/ui/views/reload_button_unittest.cc +++ b/chrome/browser/ui/views/reload_button_unittest.cc @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "base/message_loop.h" -#include "chrome/browser/views/reload_button.h" +#include "chrome/browser/ui/views/reload_button.h" #include "testing/gtest/include/gtest/gtest.h" class ReloadButtonTest : public testing::Test { diff --git a/chrome/browser/ui/views/repost_form_warning_view.cc b/chrome/browser/ui/views/repost_form_warning_view.cc index 18022e8..1d0de64 100644 --- a/chrome/browser/ui/views/repost_form_warning_view.cc +++ b/chrome/browser/ui/views/repost_form_warning_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/repost_form_warning_view.h" +#include "chrome/browser/ui/views/repost_form_warning_view.h" #include "app/l10n_util.h" #include "app/message_box_flags.h" diff --git a/chrome/browser/ui/views/restart_message_box.cc b/chrome/browser/ui/views/restart_message_box.cc index 4e2804d..0ff60e7 100644 --- a/chrome/browser/ui/views/restart_message_box.cc +++ b/chrome/browser/ui/views/restart_message_box.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/restart_message_box.h" +#include "chrome/browser/ui/views/restart_message_box.h" #include "app/l10n_util.h" #include "app/message_box_flags.h" diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index 876f9ed..3c3abb6 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/sad_tab_view.h" +#include "chrome/browser/ui/views/sad_tab_view.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc index 1ebf2e5..4ce6fa7 100644 --- a/chrome/browser/ui/views/select_file_dialog.cc +++ b/chrome/browser/ui/views/select_file_dialog.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,8 +19,8 @@ #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/browser_dialogs.h" -#include "chrome/browser/views/html_dialog_view.h" +#include "chrome/browser/ui/views/browser_dialogs.h" +#include "chrome/browser/ui/views/html_dialog_view.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "views/window/non_client_view.h" diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index a684464..6bf4d2f 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/status_bubble_views.h" +#include "chrome/browser/ui/views/status_bubble_views.h" #include <algorithm> diff --git a/chrome/browser/ui/views/status_icons/status_icon_win.cc b/chrome/browser/ui/views/status_icons/status_icon_win.cc index 5545560..d4572e4 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_win.cc +++ b/chrome/browser/ui/views/status_icons/status_icon_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/status_icons/status_icon_win.h" +#include "chrome/browser/ui/views/status_icons/status_icon_win.h" #include "base/sys_string_conversions.h" #include "gfx/icon_util.h" diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.cc b/chrome/browser/ui/views/status_icons/status_tray_win.cc index 53f80f9..e4e6d5d 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_win.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/status_icons/status_tray_win.h" +#include "chrome/browser/ui/views/status_icons/status_tray_win.h" #include "app/win/hwnd_util.h" -#include "chrome/browser/views/status_icons/status_icon_win.h" +#include "chrome/browser/ui/views/status_icons/status_icon_win.h" #include "chrome/common/chrome_constants.h" static const UINT kStatusIconMessage = WM_APP + 1; diff --git a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc index c824755..5f61c45 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,8 +6,8 @@ #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/views/status_icons/status_icon_win.h" -#include "chrome/browser/views/status_icons/status_tray_win.h" +#include "chrome/browser/ui/views/status_icons/status_icon_win.h" +#include "chrome/browser/ui/views/status_icons/status_tray_win.h" #include "grit/browser_resources.h" #include "grit/theme_resources.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc index 82c0b26..2013a65 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tab_contents/native_tab_contents_container_gtk.h" +#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/tab_contents/interstitial_page.h" diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h index a863e2b..122b3d3 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <gtk/gtk.h> -#include "chrome/browser/views/tab_contents/native_tab_contents_container.h" +#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h" #include "views/controls/native/native_view_host.h" class NativeTabContentsContainerGtk : public NativeTabContentsContainer, diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc index 99c37a9..ae94dd2 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tab_contents/native_tab_contents_container_win.h" +#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/tab_contents/interstitial_page.h" diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h index 8d12f0e..a390b49 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_WIN_H_ #pragma once -#include "chrome/browser/views/tab_contents/native_tab_contents_container.h" +#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h" #include "views/controls/native/native_view_host.h" class NativeTabContentsContainerWin : public NativeTabContentsContainer, diff --git a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc index 75675cd..a5ad31d 100644 --- a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc +++ b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tab_contents/render_view_context_menu_views.h" +#include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" #include "app/keyboard_codes.h" #include "base/logging.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container.cc b/chrome/browser/ui/views/tab_contents/tab_contents_container.cc index 47ed229..06c3400 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_container.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_container.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tab_contents/tab_contents_container.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container.h b/chrome/browser/ui/views/tab_contents/tab_contents_container.h index 9928f5b..83633e8 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_container.h +++ b/chrome/browser/ui/views/tab_contents/tab_contents_container.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_H_ #pragma once -#include "chrome/browser/views/tab_contents/native_tab_contents_container.h" +#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "views/view.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc index 4b21ec0..f4d3f9d 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tab_contents/tab_contents_drag_win.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h" #include <windows.h> @@ -23,7 +23,7 @@ #include "chrome/browser/tab_contents/web_drag_source_win.h" #include "chrome/browser/tab_contents/web_drag_utils_win.h" #include "chrome/browser/tab_contents/web_drop_target_win.h" -#include "chrome/browser/views/tab_contents/tab_contents_view_win.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_view_win.h" #include "chrome/common/url_constants.h" #include "net/base/net_util.h" #include "views/drag_utils.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.cc index 3d0db15..4d27e95 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tab_contents/tab_contents_view_gtk.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.h" #include <gdk/gdk.h> #include <gtk/gtk.h> @@ -20,8 +20,8 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/web_drag_dest_gtk.h" -#include "chrome/browser/views/sad_tab_view.h" -#include "chrome/browser/views/tab_contents/render_view_context_menu_views.h" +#include "chrome/browser/ui/views/sad_tab_view.h" +#include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" #include "gfx/canvas_skia_paint.h" #include "gfx/point.h" #include "gfx/rect.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc index 5abdc07..ec48536 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,8 +13,8 @@ #include "chrome/browser/tab_contents/interstitial_page.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" -#include "chrome/browser/views/sad_tab_view.h" -#include "chrome/browser/views/tab_contents/render_view_context_menu_views.h" +#include "chrome/browser/ui/views/sad_tab_view.h" +#include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" #include "gfx/canvas_skia_paint.h" #include "gfx/point.h" #include "gfx/rect.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_win.cc index 164fd92..3124926 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_win.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tab_contents/tab_contents_view_win.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_view_win.h" #include <windows.h> @@ -17,9 +17,9 @@ #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/web_drop_target_win.h" #include "chrome/browser/ui/browser.h" // TODO(beng): this dependency is awful. -#include "chrome/browser/views/sad_tab_view.h" -#include "chrome/browser/views/tab_contents/render_view_context_menu_views.h" -#include "chrome/browser/views/tab_contents/tab_contents_drag_win.h" +#include "chrome/browser/ui/views/sad_tab_view.h" +#include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h" #include "gfx/canvas_skia_paint.h" #include "views/focus/view_storage.h" #include "views/screen.h" diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc index 27f82d4..40b4ca2 100644 --- a/chrome/browser/ui/views/tab_icon_view.cc +++ b/chrome/browser/ui/views/tab_icon_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tab_icon_view.h" +#include "chrome/browser/ui/views/tab_icon_view.h" #if defined(OS_WIN) #include <windows.h> diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc index 0a60a11..61ccc35 100644 --- a/chrome/browser/ui/views/tabs/base_tab.cc +++ b/chrome/browser/ui/views/tabs/base_tab.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tabs/base_tab.h" +#include "chrome/browser/ui/views/tabs/base_tab.h" #include <limits> diff --git a/chrome/browser/ui/views/tabs/base_tab.h b/chrome/browser/ui/views/tabs/base_tab.h index 1a98bdc..b4ce54d 100644 --- a/chrome/browser/ui/views/tabs/base_tab.h +++ b/chrome/browser/ui/views/tabs/base_tab.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "chrome/browser/views/tabs/tab_renderer_data.h" +#include "chrome/browser/ui/views/tabs/tab_renderer_data.h" #include "ui/base/animation/animation_container.h" #include "ui/base/animation/animation_delegate.h" #include "views/controls/button/button.h" diff --git a/chrome/browser/ui/views/tabs/base_tab_strip.cc b/chrome/browser/ui/views/tabs/base_tab_strip.cc index 8a467d9..79e8f5f 100644 --- a/chrome/browser/ui/views/tabs/base_tab_strip.cc +++ b/chrome/browser/ui/views/tabs/base_tab_strip.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tabs/base_tab_strip.h" +#include "chrome/browser/ui/views/tabs/base_tab_strip.h" #include "base/logging.h" #include "chrome/browser/ui/view_ids.h" diff --git a/chrome/browser/ui/views/tabs/base_tab_strip.h b/chrome/browser/ui/views/tabs/base_tab_strip.h index 98b304e..4f5dc01 100644 --- a/chrome/browser/ui/views/tabs/base_tab_strip.h +++ b/chrome/browser/ui/views/tabs/base_tab_strip.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,8 +9,8 @@ #include <vector> #include "base/scoped_ptr.h" -#include "chrome/browser/views/tabs/base_tab.h" -#include "chrome/browser/views/tabs/tab_controller.h" +#include "chrome/browser/ui/views/tabs/base_tab.h" +#include "chrome/browser/ui/views/tabs/tab_controller.h" #include "views/animation/bounds_animator.h" #include "views/view.h" diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 51e24af..6d34d8c 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tabs/browser_tab_strip_controller.h" +#include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" #include "base/auto_reset.h" #include "base/command_line.h" diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h index 1dcd1f4..f36febd 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/browser/views/tabs/tab_strip_controller.h" +#include "chrome/browser/ui/views/tabs/tab_strip_controller.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc index e23e1c4..35ea20d 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tabs/dragged_tab_controller.h" +#include "chrome/browser/ui/views/tabs/dragged_tab_controller.h" #include <math.h> #include <set> @@ -15,16 +15,16 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/metrics/user_metrics.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/tabs/base_tab.h" -#include "chrome/browser/views/tabs/base_tab_strip.h" -#include "chrome/browser/views/tabs/browser_tab_strip_controller.h" -#include "chrome/browser/views/tabs/dragged_tab_view.h" -#include "chrome/browser/views/tabs/native_view_photobooth.h" -#include "chrome/browser/views/tabs/side_tab.h" -#include "chrome/browser/views/tabs/side_tab_strip.h" -#include "chrome/browser/views/tabs/tab.h" -#include "chrome/browser/views/tabs/tab_strip.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/tabs/base_tab.h" +#include "chrome/browser/ui/views/tabs/base_tab_strip.h" +#include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" +#include "chrome/browser/ui/views/tabs/dragged_tab_view.h" +#include "chrome/browser/ui/views/tabs/native_view_photobooth.h" +#include "chrome/browser/ui/views/tabs/side_tab.h" +#include "chrome/browser/ui/views/tabs/side_tab_strip.h" +#include "chrome/browser/ui/views/tabs/tab.h" +#include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "gfx/canvas_skia.h" diff --git a/chrome/browser/ui/views/tabs/dragged_tab_view.cc b/chrome/browser/ui/views/tabs/dragged_tab_view.cc index 8f77a87..7451732 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_view.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tabs/dragged_tab_view.h" +#include "chrome/browser/ui/views/tabs/dragged_tab_view.h" -#include "chrome/browser/views/tabs/native_view_photobooth.h" +#include "chrome/browser/ui/views/tabs/native_view_photobooth.h" #include "gfx/canvas_skia.h" #include "third_party/skia/include/core/SkShader.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/tabs/native_view_photobooth_gtk.cc b/chrome/browser/ui/views/tabs/native_view_photobooth_gtk.cc index a307112..a9c7f48 100644 --- a/chrome/browser/ui/views/tabs/native_view_photobooth_gtk.cc +++ b/chrome/browser/ui/views/tabs/native_view_photobooth_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tabs/native_view_photobooth_gtk.h" +#include "chrome/browser/ui/views/tabs/native_view_photobooth_gtk.h" #include "base/logging.h" #include "gfx/canvas.h" diff --git a/chrome/browser/ui/views/tabs/native_view_photobooth_gtk.h b/chrome/browser/ui/views/tabs/native_view_photobooth_gtk.h index 8764e89..f2082db 100644 --- a/chrome/browser/ui/views/tabs/native_view_photobooth_gtk.h +++ b/chrome/browser/ui/views/tabs/native_view_photobooth_gtk.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_GTK_H_ #pragma once -#include "chrome/browser/views/tabs/native_view_photobooth.h" +#include "chrome/browser/ui/views/tabs/native_view_photobooth.h" class NativeViewPhotoboothGtk : public NativeViewPhotobooth { public: diff --git a/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc b/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc index d749ea0..7ea3ad3 100644 --- a/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc +++ b/chrome/browser/ui/views/tabs/native_view_photobooth_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tabs/native_view_photobooth_win.h" +#include "chrome/browser/ui/views/tabs/native_view_photobooth_win.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "gfx/canvas_skia.h" diff --git a/chrome/browser/ui/views/tabs/native_view_photobooth_win.h b/chrome/browser/ui/views/tabs/native_view_photobooth_win.h index 5797910..44402ae 100644 --- a/chrome/browser/ui/views/tabs/native_view_photobooth_win.h +++ b/chrome/browser/ui/views/tabs/native_view_photobooth_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_WIN_H_ #pragma once -#include "chrome/browser/views/tabs/native_view_photobooth.h" +#include "chrome/browser/ui/views/tabs/native_view_photobooth.h" namespace views { class WidgetWin; diff --git a/chrome/browser/ui/views/tabs/side_tab.cc b/chrome/browser/ui/views/tabs/side_tab.cc index b42bca0..78b0c5a 100644 --- a/chrome/browser/ui/views/tabs/side_tab.cc +++ b/chrome/browser/ui/views/tabs/side_tab.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tabs/side_tab.h" +#include "chrome/browser/ui/views/tabs/side_tab.h" #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/views/tabs/side_tab.h b/chrome/browser/ui/views/tabs/side_tab.h index c82f5c9..5eea288 100644 --- a/chrome/browser/ui/views/tabs/side_tab.h +++ b/chrome/browser/ui/views/tabs/side_tab.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_SIDE_TAB_H_ #pragma once -#include "chrome/browser/views/tabs/base_tab.h" +#include "chrome/browser/ui/views/tabs/base_tab.h" #include "gfx/font.h" class SideTab; diff --git a/chrome/browser/ui/views/tabs/side_tab_strip.cc b/chrome/browser/ui/views/tabs/side_tab_strip.cc index c9e2b69..0df8ce2 100644 --- a/chrome/browser/ui/views/tabs/side_tab_strip.cc +++ b/chrome/browser/ui/views/tabs/side_tab_strip.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tabs/side_tab_strip.h" +#include "chrome/browser/ui/views/tabs/side_tab_strip.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/ui/views/tabs/side_tab_strip.h b/chrome/browser/ui/views/tabs/side_tab_strip.h index 6e091a8f..021beae 100644 --- a/chrome/browser/ui/views/tabs/side_tab_strip.h +++ b/chrome/browser/ui/views/tabs/side_tab_strip.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_SIDE_TAB_STRIP_H_ #pragma once -#include "chrome/browser/views/tabs/base_tab_strip.h" +#include "chrome/browser/ui/views/tabs/base_tab_strip.h" struct TabRendererData; diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h index 743f818..5665fd1 100644 --- a/chrome/browser/ui/views/tabs/tab.h +++ b/chrome/browser/ui/views/tabs/tab.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include <string> #include "base/scoped_ptr.h" -#include "chrome/browser/views/tabs/base_tab.h" +#include "chrome/browser/ui/views/tabs/base_tab.h" #include "gfx/point.h" namespace ui { diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index f0c6017..063e448 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/tabs/tab_strip.h" +#include "chrome/browser/ui/views/tabs/tab_strip.h" #include "app/drag_drop_types.h" #include "app/l10n_util.h" diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h index ca2aed3..b15b86b 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.h +++ b/chrome/browser/ui/views/tabs/tab_strip.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/ref_counted.h" #include "base/timer.h" -#include "chrome/browser/views/tabs/base_tab_strip.h" +#include "chrome/browser/ui/views/tabs/base_tab_strip.h" #include "gfx/point.h" #include "gfx/rect.h" #include "ui/base/animation/animation_container.h" diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index a80d6de..4953308 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,7 +16,7 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/memory_purger.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/views/browser_dialogs.h" +#include "chrome/browser/ui/views/browser_dialogs.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/views/textfield_views.cc b/chrome/browser/ui/views/textfield_views.cc index f15be68..7d28fc3 100644 --- a/chrome/browser/ui/views/textfield_views.cc +++ b/chrome/browser/ui/views/textfield_views.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/textfield_views.h" +#include "chrome/browser/ui/views/textfield_views.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/views/textfield_views.h b/chrome/browser/ui/views/textfield_views.h index 10fe0a1..d605006 100644 --- a/chrome/browser/ui/views/textfield_views.h +++ b/chrome/browser/ui/views/textfield_views.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <string> -#include "chrome/browser/views/dom_view.h" +#include "chrome/browser/ui/views/dom_view.h" class TextfieldsUI; diff --git a/chrome/browser/ui/views/theme_background.cc b/chrome/browser/ui/views/theme_background.cc index b2320fc..be8e8f7 100644 --- a/chrome/browser/ui/views/theme_background.cc +++ b/chrome/browser/ui/views/theme_background.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/theme_background.h" +#include "chrome/browser/ui/views/theme_background.h" #include "app/resource_bundle.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/browser_theme_provider.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "gfx/canvas.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/theme_helpers.cc b/chrome/browser/ui/views/theme_helpers.cc index 41f6db5..15b9236 100644 --- a/chrome/browser/ui/views/theme_helpers.cc +++ b/chrome/browser/ui/views/theme_helpers.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/theme_helpers.h" +#include "chrome/browser/ui/views/theme_helpers.h" #include <atlbase.h> #include <atlapp.h> diff --git a/chrome/browser/ui/views/theme_install_bubble_view.cc b/chrome/browser/ui/views/theme_install_bubble_view.cc index 157e7fd..71e4171 100644 --- a/chrome/browser/ui/views/theme_install_bubble_view.cc +++ b/chrome/browser/ui/views/theme_install_bubble_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/theme_install_bubble_view.h" +#include "chrome/browser/ui/views/theme_install_bubble_view.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 3ebeef9..dca962e 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/toolbar_view.h" +#include "chrome/browser/ui/views/toolbar_view.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -43,7 +43,7 @@ #include "chrome/browser/chromeos/dom_ui/wrench_menu_ui.h" #include "views/controls/menu/menu_2.h" #endif -#include "chrome/browser/views/wrench_menu.h" +#include "chrome/browser/ui/views/wrench_menu.h" #if defined(OS_WIN) #include "chrome/browser/enumerate_modules_model_win.h" @@ -358,7 +358,7 @@ void ToolbarView::RunMenu(views::View* source, const gfx::Point& /* pt */) { wrench_menu_->RunMenu(app_menu_); #if defined(OS_CHROMEOS) -cleanup: + cleanup: #endif if (destroyed_flag) return; diff --git a/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc b/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc index bb77b8b..b31b9f6 100644 --- a/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc +++ b/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/unhandled_keyboard_event_handler.h" +#include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" #include "base/logging.h" #include "views/focus/focus_manager.h" diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc index 2217319..82e7459 100644 --- a/chrome/browser/ui/views/uninstall_view.cc +++ b/chrome/browser/ui/views/uninstall_view.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/uninstall_view.h" +#include "chrome/browser/ui/views/uninstall_view.h" #include "app/l10n_util.h" #include "base/message_loop.h" diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc index 019846e..c3f8f6a 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.cc +++ b/chrome/browser/ui/views/update_recommended_message_box.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/update_recommended_message_box.h" +#include "chrome/browser/ui/views/update_recommended_message_box.h" #include "app/l10n_util.h" #include "app/message_box_flags.h" @@ -10,7 +10,7 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/window.h" #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/url_picker.cc b/chrome/browser/ui/views/url_picker.cc index e1977ee..e020de3 100644 --- a/chrome/browser/ui/views/url_picker.cc +++ b/chrome/browser/ui/views/url_picker.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/url_picker.h" +#include "chrome/browser/ui/views/url_picker.h" #include "app/keyboard_codes.h" #include "app/l10n_util.h" diff --git a/chrome/browser/ui/views/user_data_dir_dialog.cc b/chrome/browser/ui/views/user_data_dir_dialog.cc index 9784cd5..e76415d 100644 --- a/chrome/browser/ui/views/user_data_dir_dialog.cc +++ b/chrome/browser/ui/views/user_data_dir_dialog.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #include "app/message_box_flags.h" #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/views/user_data_dir_dialog.h" +#include "chrome/browser/ui/views/user_data_dir_dialog.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "views/controls/message_box_view.h" diff --git a/chrome/browser/ui/views/window.cc b/chrome/browser/ui/views/window.cc index ae28ce4..f9094dc 100644 --- a/chrome/browser/ui/views/window.cc +++ b/chrome/browser/ui/views/window.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/window.h" +#include "chrome/browser/ui/views/window.h" #include "gfx/rect.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index 88f8ee3..53c012b 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/wrench_menu.h" +#include "chrome/browser/ui/views/wrench_menu.h" #include <cmath> diff --git a/chrome/browser/views/about_chrome_view.h b/chrome/browser/views/about_chrome_view.h deleted file mode 100644 index cb2a7dd6..0000000 --- a/chrome/browser/views/about_chrome_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_ABOUT_CHROME_VIEW_H_ -#define CHROME_BROWSER_VIEWS_ABOUT_CHROME_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/about_chrome_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_ABOUT_CHROME_VIEW_H_ - diff --git a/chrome/browser/views/about_ipc_dialog.h b/chrome/browser/views/about_ipc_dialog.h deleted file mode 100644 index 13c1255..0000000 --- a/chrome/browser/views/about_ipc_dialog.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_ -#define CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_ -#pragma once - -#include "chrome/browser/ui/views/about_ipc_dialog.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_ - diff --git a/chrome/browser/views/accelerator_table_gtk.h b/chrome/browser/views/accelerator_table_gtk.h deleted file mode 100644 index 1b3a20a..0000000 --- a/chrome/browser/views/accelerator_table_gtk.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_ACCELERATOR_TABLE_GTK_H_ -#define CHROME_BROWSER_VIEWS_ACCELERATOR_TABLE_GTK_H_ -#pragma once - -#include "chrome/browser/ui/views/accelerator_table_gtk.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_ACCELERATOR_TABLE_GTK_H_ - diff --git a/chrome/browser/views/accessibility_event_router_views.h b/chrome/browser/views/accessibility_event_router_views.h deleted file mode 100644 index e3850b2..0000000 --- a/chrome/browser/views/accessibility_event_router_views.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_ACCESSIBILITY_EVENT_ROUTER_VIEWS_H_ -#define CHROME_BROWSER_VIEWS_ACCESSIBILITY_EVENT_ROUTER_VIEWS_H_ -#pragma once - -#include "chrome/browser/ui/views/accessibility_event_router_views.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_ACCESSIBILITY_EVENT_ROUTER_VIEWS_H_ - diff --git a/chrome/browser/views/accessible_pane_view.h b/chrome/browser/views/accessible_pane_view.h deleted file mode 100644 index 8a2ebb1..0000000 --- a/chrome/browser/views/accessible_pane_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_ACCESSIBLE_PANE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_ACCESSIBLE_PANE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/accessible_pane_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_ACCESSIBLE_PANE_VIEW_H_ - diff --git a/chrome/browser/views/accessible_view_helper.h b/chrome/browser/views/accessible_view_helper.h deleted file mode 100644 index e02fde1..0000000 --- a/chrome/browser/views/accessible_view_helper.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_ACCESSIBLE_VIEW_HELPER_H_ -#define CHROME_BROWSER_VIEWS_ACCESSIBLE_VIEW_HELPER_H_ -#pragma once - -#include "chrome/browser/ui/views/accessible_view_helper.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_ACCESSIBLE_VIEW_HELPER_H_ - diff --git a/chrome/browser/views/appcache_info_view.h b/chrome/browser/views/appcache_info_view.h deleted file mode 100644 index 991b819..0000000 --- a/chrome/browser/views/appcache_info_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_APPCACHE_INFO_VIEW_H_ -#define CHROME_BROWSER_VIEWS_APPCACHE_INFO_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/appcache_info_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_APPCACHE_INFO_VIEW_H_ - diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h deleted file mode 100644 index 770818d..0000000 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_ -#define CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_ - diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_gtk.h b/chrome/browser/views/autocomplete/autocomplete_popup_gtk.h deleted file mode 100644 index f3a156f..0000000 --- a/chrome/browser/views/autocomplete/autocomplete_popup_gtk.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_GTK_H_ -#define CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_GTK_H_ -#pragma once - -#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_GTK_H_ - diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_win.h b/chrome/browser/views/autocomplete/autocomplete_popup_win.h deleted file mode 100644 index 68fa02c..0000000 --- a/chrome/browser/views/autocomplete/autocomplete_popup_win.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_WIN_H_ -#define CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_WIN_H_ -#pragma once - -#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_win.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_WIN_H_ - diff --git a/chrome/browser/views/autofill_profiles_view_win.h b/chrome/browser/views/autofill_profiles_view_win.h deleted file mode 100644 index 5768e9f..0000000 --- a/chrome/browser/views/autofill_profiles_view_win.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_AUTOFILL_PROFILES_VIEW_WIN_H_ -#define CHROME_BROWSER_VIEWS_AUTOFILL_PROFILES_VIEW_WIN_H_ -#pragma once - -#include "chrome/browser/ui/views/autofill_profiles_view_win.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_AUTOFILL_PROFILES_VIEW_WIN_H_ - diff --git a/chrome/browser/views/bookmark_bar_instructions_view.h b/chrome/browser/views/bookmark_bar_instructions_view.h deleted file mode 100644 index 599ad78..0000000 --- a/chrome/browser/views/bookmark_bar_instructions_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_ -#define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/bookmark_bar_instructions_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_ - diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h deleted file mode 100644 index 7dea837..0000000 --- a/chrome/browser/views/bookmark_bar_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ -#define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/bookmark_bar_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ - diff --git a/chrome/browser/views/bookmark_bubble_view.h b/chrome/browser/views/bookmark_bubble_view.h deleted file mode 100644 index cd35459..0000000 --- a/chrome/browser/views/bookmark_bubble_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BUBBLE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_BOOKMARK_BUBBLE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/bookmark_bubble_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_BOOKMARK_BUBBLE_VIEW_H_ - diff --git a/chrome/browser/views/bookmark_context_menu.h b/chrome/browser/views/bookmark_context_menu.h deleted file mode 100644 index 1f6f2f2..0000000 --- a/chrome/browser/views/bookmark_context_menu.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_H_ -#define CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_H_ -#pragma once - -#include "chrome/browser/ui/views/bookmark_context_menu.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_H_ - diff --git a/chrome/browser/views/bookmark_context_menu_controller_views.h b/chrome/browser/views/bookmark_context_menu_controller_views.h deleted file mode 100644 index 73b54e6..0000000 --- a/chrome/browser/views/bookmark_context_menu_controller_views.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_CONTROLLER_VIEWS_H_ -#define CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_CONTROLLER_VIEWS_H_ -#pragma once - -#include "chrome/browser/ui/views/bookmark_context_menu_controller_views.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_CONTROLLER_VIEWS_H_ - diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h deleted file mode 100644 index fca0aab..0000000 --- a/chrome/browser/views/bookmark_editor_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_ -#define CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/bookmark_editor_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_ - diff --git a/chrome/browser/views/bookmark_menu_controller_views.h b/chrome/browser/views/bookmark_menu_controller_views.h deleted file mode 100644 index 2fcca0c..0000000 --- a/chrome/browser/views/bookmark_menu_controller_views.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_ -#define CHROME_BROWSER_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_ -#pragma once - -#include "chrome/browser/ui/views/bookmark_menu_controller_views.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_ - diff --git a/chrome/browser/views/browser_actions_container.h b/chrome/browser/views/browser_actions_container.h deleted file mode 100644 index 0b6b094..0000000 --- a/chrome/browser/views/browser_actions_container.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ -#define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ -#pragma once - -#include "chrome/browser/ui/views/browser_actions_container.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ - diff --git a/chrome/browser/views/browser_bubble.h b/chrome/browser/views/browser_bubble.h deleted file mode 100644 index cc4352c..0000000 --- a/chrome/browser/views/browser_bubble.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_BROWSER_BUBBLE_H_ -#define CHROME_BROWSER_VIEWS_BROWSER_BUBBLE_H_ -#pragma once - -#include "chrome/browser/ui/views/browser_bubble.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_BROWSER_BUBBLE_H_ - diff --git a/chrome/browser/views/browser_dialogs.h b/chrome/browser/views/browser_dialogs.h deleted file mode 100644 index ebff745..0000000 --- a/chrome/browser/views/browser_dialogs.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_BROWSER_DIALOGS_H_ -#define CHROME_BROWSER_VIEWS_BROWSER_DIALOGS_H_ -#pragma once - -#include "chrome/browser/ui/views/browser_dialogs.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_BROWSER_DIALOGS_H_ - diff --git a/chrome/browser/views/bubble_border.h b/chrome/browser/views/bubble_border.h deleted file mode 100644 index 2d88c30..0000000 --- a/chrome/browser/views/bubble_border.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_BUBBLE_BORDER_H_ -#define CHROME_BROWSER_VIEWS_BUBBLE_BORDER_H_ -#pragma once - -#include "chrome/browser/ui/views/bubble_border.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_BUBBLE_BORDER_H_ - diff --git a/chrome/browser/views/chrome_views_delegate.h b/chrome/browser/views/chrome_views_delegate.h deleted file mode 100644 index 01144e5..0000000 --- a/chrome/browser/views/chrome_views_delegate.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_CHROME_VIEWS_DELEGATE_H_ -#define CHROME_BROWSER_VIEWS_CHROME_VIEWS_DELEGATE_H_ -#pragma once - -#include "chrome/browser/ui/views/chrome_views_delegate.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_CHROME_VIEWS_DELEGATE_H_ - diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h deleted file mode 100644 index e9d8b20..0000000 --- a/chrome/browser/views/clear_browsing_data.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H_ -#define CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H_ -#pragma once - -#include "chrome/browser/ui/views/clear_browsing_data.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H_ - diff --git a/chrome/browser/views/clear_browsing_data_view.h b/chrome/browser/views/clear_browsing_data_view.h deleted file mode 100644 index 9911fb1..0000000 --- a/chrome/browser/views/clear_browsing_data_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_VIEW_H_ -#define CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/clear_browsing_data_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_VIEW_H_ - diff --git a/chrome/browser/views/clear_data_view.h b/chrome/browser/views/clear_data_view.h deleted file mode 100644 index f03a941..0000000 --- a/chrome/browser/views/clear_data_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_CLEAR_DATA_VIEW_H_ -#define CHROME_BROWSER_VIEWS_CLEAR_DATA_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/clear_data_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_CLEAR_DATA_VIEW_H_ - diff --git a/chrome/browser/views/clear_server_data.h b/chrome/browser/views/clear_server_data.h deleted file mode 100644 index ecce971..0000000 --- a/chrome/browser/views/clear_server_data.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_CLEAR_SERVER_DATA_H_ -#define CHROME_BROWSER_VIEWS_CLEAR_SERVER_DATA_H_ -#pragma once - -#include "chrome/browser/ui/views/clear_server_data.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_CLEAR_SERVER_DATA_H_ - diff --git a/chrome/browser/views/collected_cookies_win.h b/chrome/browser/views/collected_cookies_win.h deleted file mode 100644 index a13b856..0000000 --- a/chrome/browser/views/collected_cookies_win.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_COLLECTED_COOKIES_WIN_H_ -#define CHROME_BROWSER_VIEWS_COLLECTED_COOKIES_WIN_H_ -#pragma once - -#include "chrome/browser/ui/views/collected_cookies_win.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_COLLECTED_COOKIES_WIN_H_ - diff --git a/chrome/browser/views/confirm_message_box_dialog.h b/chrome/browser/views/confirm_message_box_dialog.h deleted file mode 100644 index 26ca059..0000000 --- a/chrome/browser/views/confirm_message_box_dialog.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_CONFIRM_MESSAGE_BOX_DIALOG_H_ -#define CHROME_BROWSER_VIEWS_CONFIRM_MESSAGE_BOX_DIALOG_H_ -#pragma once - -#include "chrome/browser/ui/views/confirm_message_box_dialog.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_CONFIRM_MESSAGE_BOX_DIALOG_H_ - diff --git a/chrome/browser/views/constrained_window_win.h b/chrome/browser/views/constrained_window_win.h deleted file mode 100644 index 61ed885..0000000 --- a/chrome/browser/views/constrained_window_win.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_CONSTRAINED_WINDOW_WIN_H_ -#define CHROME_BROWSER_VIEWS_CONSTRAINED_WINDOW_WIN_H_ -#pragma once - -#include "chrome/browser/ui/views/constrained_window_win.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_CONSTRAINED_WINDOW_WIN_H_ - diff --git a/chrome/browser/views/content_setting_bubble_contents.h b/chrome/browser/views/content_setting_bubble_contents.h deleted file mode 100644 index 03ac993..0000000 --- a/chrome/browser/views/content_setting_bubble_contents.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_ -#define CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_ -#pragma once - -#include "chrome/browser/ui/views/content_setting_bubble_contents.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_ - diff --git a/chrome/browser/views/cookie_info_view.h b/chrome/browser/views/cookie_info_view.h deleted file mode 100644 index 6eb19e5..0000000 --- a/chrome/browser/views/cookie_info_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_COOKIE_INFO_VIEW_H_ -#define CHROME_BROWSER_VIEWS_COOKIE_INFO_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/cookie_info_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_COOKIE_INFO_VIEW_H_ - diff --git a/chrome/browser/views/create_application_shortcut_view.h b/chrome/browser/views/create_application_shortcut_view.h deleted file mode 100644 index d117ab2..0000000 --- a/chrome/browser/views/create_application_shortcut_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_ -#define CHROME_BROWSER_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/create_application_shortcut_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_ - diff --git a/chrome/browser/views/database_info_view.h b/chrome/browser/views/database_info_view.h deleted file mode 100644 index 5f7e747..0000000 --- a/chrome/browser/views/database_info_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_DATABASE_INFO_VIEW_H_ -#define CHROME_BROWSER_VIEWS_DATABASE_INFO_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/database_info_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_DATABASE_INFO_VIEW_H_ - diff --git a/chrome/browser/views/database_open_info_view.h b/chrome/browser/views/database_open_info_view.h deleted file mode 100644 index be808238..0000000 --- a/chrome/browser/views/database_open_info_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_DATABASE_OPEN_INFO_VIEW_H_ -#define CHROME_BROWSER_VIEWS_DATABASE_OPEN_INFO_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/database_open_info_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_DATABASE_OPEN_INFO_VIEW_H_ - diff --git a/chrome/browser/views/default_search_view.h b/chrome/browser/views/default_search_view.h deleted file mode 100644 index 12651c4..0000000 --- a/chrome/browser/views/default_search_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_DEFAULT_SEARCH_VIEW_H_ -#define CHROME_BROWSER_VIEWS_DEFAULT_SEARCH_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/default_search_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_DEFAULT_SEARCH_VIEW_H_ - diff --git a/chrome/browser/views/detachable_toolbar_view.h b/chrome/browser/views/detachable_toolbar_view.h deleted file mode 100644 index 68c967b..0000000 --- a/chrome/browser/views/detachable_toolbar_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_DETACHABLE_TOOLBAR_VIEW_H_ -#define CHROME_BROWSER_VIEWS_DETACHABLE_TOOLBAR_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/detachable_toolbar_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_DETACHABLE_TOOLBAR_VIEW_H_ - diff --git a/chrome/browser/views/dom_view.h b/chrome/browser/views/dom_view.h deleted file mode 100644 index 095fcb7..0000000 --- a/chrome/browser/views/dom_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_DOM_VIEW_H_ -#define CHROME_BROWSER_VIEWS_DOM_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/dom_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_DOM_VIEW_H_ - diff --git a/chrome/browser/views/download_item_view.h b/chrome/browser/views/download_item_view.h deleted file mode 100644 index cb7dd5c..0000000 --- a/chrome/browser/views/download_item_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_DOWNLOAD_ITEM_VIEW_H_ -#define CHROME_BROWSER_VIEWS_DOWNLOAD_ITEM_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/download_item_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_DOWNLOAD_ITEM_VIEW_H_ - diff --git a/chrome/browser/views/download_shelf_view.h b/chrome/browser/views/download_shelf_view.h deleted file mode 100644 index 628abba..0000000 --- a/chrome/browser/views/download_shelf_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_DOWNLOAD_SHELF_VIEW_H_ -#define CHROME_BROWSER_DOWNLOAD_SHELF_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/download_shelf_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOWNLOAD_SHELF_VIEW_H_ - diff --git a/chrome/browser/views/dropdown_bar_host.h b/chrome/browser/views/dropdown_bar_host.h deleted file mode 100644 index 23c9053..0000000 --- a/chrome/browser/views/dropdown_bar_host.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_DROPDOWN_BAR_HOST_H_ -#define CHROME_BROWSER_VIEWS_DROPDOWN_BAR_HOST_H_ -#pragma once - -#include "chrome/browser/ui/views/dropdown_bar_host.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_DROPDOWN_BAR_HOST_H_ - diff --git a/chrome/browser/views/dropdown_bar_view.h b/chrome/browser/views/dropdown_bar_view.h deleted file mode 100644 index 9ae52cc..0000000 --- a/chrome/browser/views/dropdown_bar_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_DROPDOWN_BAR_VIEW_H_ -#define CHROME_BROWSER_VIEWS_DROPDOWN_BAR_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/dropdown_bar_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_DROPDOWN_BAR_VIEW_H_ - diff --git a/chrome/browser/views/edit_search_engine_dialog.h b/chrome/browser/views/edit_search_engine_dialog.h deleted file mode 100644 index f5881ec..0000000 --- a/chrome/browser/views/edit_search_engine_dialog.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_EDIT_SEARCH_ENGINE_DIALOG_H_ -#define CHROME_BROWSER_VIEWS_EDIT_SEARCH_ENGINE_DIALOG_H_ -#pragma once - -#include "chrome/browser/ui/views/edit_search_engine_dialog.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_EDIT_SEARCH_ENGINE_DIALOG_H_ - diff --git a/chrome/browser/views/event_utils.h b/chrome/browser/views/event_utils.h deleted file mode 100644 index 7d7d370..0000000 --- a/chrome/browser/views/event_utils.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_EVENT_UTILS_H_ -#define CHROME_BROWSER_VIEWS_EVENT_UTILS_H_ -#pragma once - -#include "chrome/browser/ui/views/event_utils.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_EVENT_UTILS_H_ - diff --git a/chrome/browser/views/extensions/browser_action_drag_data.h b/chrome/browser/views/extensions/browser_action_drag_data.h deleted file mode 100644 index ee3ac8f..0000000 --- a/chrome/browser/views/extensions/browser_action_drag_data.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_DRAG_DATA_H_ -#define CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_DRAG_DATA_H_ -#pragma once - -#include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_DRAG_DATA_H_ - diff --git a/chrome/browser/views/extensions/browser_action_overflow_menu_controller.h b/chrome/browser/views/extensions/browser_action_overflow_menu_controller.h deleted file mode 100644 index 5023765..0000000 --- a/chrome/browser/views/extensions/browser_action_overflow_menu_controller.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_ -#define CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_ -#pragma once - -#include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_ - diff --git a/chrome/browser/views/extensions/extension_installed_bubble.h b/chrome/browser/views/extensions/extension_installed_bubble.h deleted file mode 100644 index ab1c498..0000000 --- a/chrome/browser/views/extensions/extension_installed_bubble.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_ -#define CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_ -#pragma once - -#include "chrome/browser/ui/views/extensions/extension_installed_bubble.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_ - diff --git a/chrome/browser/views/extensions/extension_popup.h b/chrome/browser/views/extensions/extension_popup.h deleted file mode 100644 index 6bfa6f6..0000000 --- a/chrome/browser/views/extensions/extension_popup.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_POPUP_H_ -#define CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_POPUP_H_ -#pragma once - -#include "chrome/browser/ui/views/extensions/extension_popup.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_POPUP_H_ - diff --git a/chrome/browser/views/extensions/extension_view.h b/chrome/browser/views/extensions/extension_view.h deleted file mode 100644 index f7b4e8d..0000000 --- a/chrome/browser/views/extensions/extension_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_VIEW_H_ -#define CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/extensions/extension_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_VIEW_H_ - diff --git a/chrome/browser/views/external_protocol_dialog.h b/chrome/browser/views/external_protocol_dialog.h deleted file mode 100644 index 9925dd4..0000000 --- a/chrome/browser/views/external_protocol_dialog.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_EXTERNAL_PROTOCOL_DIALOG_H_ -#define CHROME_BROWSER_VIEWS_EXTERNAL_PROTOCOL_DIALOG_H_ -#pragma once - -#include "chrome/browser/ui/views/external_protocol_dialog.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_EXTERNAL_PROTOCOL_DIALOG_H_ - diff --git a/chrome/browser/views/find_bar_host.h b/chrome/browser/views/find_bar_host.h deleted file mode 100644 index 4e34679..0000000 --- a/chrome/browser/views/find_bar_host.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FIND_BAR_HOST_H_ -#define CHROME_BROWSER_VIEWS_FIND_BAR_HOST_H_ -#pragma once - -#include "chrome/browser/ui/views/find_bar_host.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FIND_BAR_HOST_H_ - diff --git a/chrome/browser/views/find_bar_view.h b/chrome/browser/views/find_bar_view.h deleted file mode 100644 index bb980df..0000000 --- a/chrome/browser/views/find_bar_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FIND_BAR_VIEW_H_ -#define CHROME_BROWSER_VIEWS_FIND_BAR_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/find_bar_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FIND_BAR_VIEW_H_ - diff --git a/chrome/browser/views/first_run_bubble.h b/chrome/browser/views/first_run_bubble.h deleted file mode 100644 index 235e004..0000000 --- a/chrome/browser/views/first_run_bubble.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FIRST_RUN_BUBBLE_H_ -#define CHROME_BROWSER_VIEWS_FIRST_RUN_BUBBLE_H_ -#pragma once - -#include "chrome/browser/ui/views/first_run_bubble.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FIRST_RUN_BUBBLE_H_ - diff --git a/chrome/browser/views/first_run_search_engine_view.h b/chrome/browser/views/first_run_search_engine_view.h deleted file mode 100644 index 7dffda0..0000000 --- a/chrome/browser/views/first_run_search_engine_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FIRST_RUN_SEARCH_ENGINE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_FIRST_RUN_SEARCH_ENGINE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/first_run_search_engine_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FIRST_RUN_SEARCH_ENGINE_VIEW_H_ - diff --git a/chrome/browser/views/frame/app_panel_browser_frame_view.h b/chrome/browser/views/frame/app_panel_browser_frame_view.h deleted file mode 100644 index cc93319..0000000 --- a/chrome/browser/views/frame/app_panel_browser_frame_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_ -#define CHROME_BROWSER_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_ - diff --git a/chrome/browser/views/frame/browser_bubble_host.h b/chrome/browser/views/frame/browser_bubble_host.h deleted file mode 100644 index f903d99..0000000 --- a/chrome/browser/views/frame/browser_bubble_host.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_BUBBLE_HOST_H_ -#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_BUBBLE_HOST_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/browser_bubble_host.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_BUBBLE_HOST_H_ - diff --git a/chrome/browser/views/frame/browser_frame.h b/chrome/browser/views/frame/browser_frame.h deleted file mode 100644 index eaf9fe6..0000000 --- a/chrome/browser/views/frame/browser_frame.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_H_ -#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/browser_frame.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_H_ - diff --git a/chrome/browser/views/frame/browser_frame_gtk.h b/chrome/browser/views/frame/browser_frame_gtk.h deleted file mode 100644 index 1b8977c..0000000 --- a/chrome/browser/views/frame/browser_frame_gtk.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_GTK_H_ -#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_GTK_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/browser_frame_gtk.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_GTK_H_ - diff --git a/chrome/browser/views/frame/browser_frame_win.h b/chrome/browser/views/frame/browser_frame_win.h deleted file mode 100644 index b755e21..0000000 --- a/chrome/browser/views/frame/browser_frame_win.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_WIN_H_ -#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_WIN_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/browser_frame_win.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_WIN_H_ - diff --git a/chrome/browser/views/frame/browser_non_client_frame_view.h b/chrome/browser/views/frame/browser_non_client_frame_view.h deleted file mode 100644 index 38b6cfd..0000000 --- a/chrome/browser/views/frame/browser_non_client_frame_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_ -#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_ - diff --git a/chrome/browser/views/frame/browser_root_view.h b/chrome/browser/views/frame/browser_root_view.h deleted file mode 100644 index bf129da..0000000 --- a/chrome/browser/views/frame/browser_root_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_POPUP_BROWSER_ROOT_VIEW_H_ -#define CHROME_BROWSER_VIEWS_FRAME_POPUP_BROWSER_ROOT_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/browser_root_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_POPUP_BROWSER_ROOT_VIEW_H_ - diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h deleted file mode 100644 index 4e90f82..0000000 --- a/chrome/browser/views/frame/browser_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_POPUP_BROWSER_VIEW_H_ -#define CHROME_BROWSER_VIEWS_FRAME_POPUP_BROWSER_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/browser_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_POPUP_BROWSER_VIEW_H_ - diff --git a/chrome/browser/views/frame/browser_view_layout.h b/chrome/browser/views/frame/browser_view_layout.h deleted file mode 100644 index a96fa8e..0000000 --- a/chrome/browser/views/frame/browser_view_layout.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_ -#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/browser_view_layout.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_ - diff --git a/chrome/browser/views/frame/contents_container.h b/chrome/browser/views/frame/contents_container.h deleted file mode 100644 index 07b7983..0000000 --- a/chrome/browser/views/frame/contents_container.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_CONTENTS_CONTAINER_H_ -#define CHROME_BROWSER_VIEWS_FRAME_CONTENTS_CONTAINER_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/contents_container.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_CONTENTS_CONTAINER_H_ - diff --git a/chrome/browser/views/frame/glass_browser_frame_view.h b/chrome/browser/views/frame/glass_browser_frame_view.h deleted file mode 100644 index 397ef26..0000000 --- a/chrome/browser/views/frame/glass_browser_frame_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ -#define CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ - diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.h b/chrome/browser/views/frame/opaque_browser_frame_view.h deleted file mode 100644 index 3e11721..0000000 --- a/chrome/browser/views/frame/opaque_browser_frame_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ -#define CHROME_BROWSER_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ - diff --git a/chrome/browser/views/frame/popup_non_client_frame_view.h b/chrome/browser/views/frame/popup_non_client_frame_view.h deleted file mode 100644 index 4866d34..0000000 --- a/chrome/browser/views/frame/popup_non_client_frame_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FRAME_POPUP_NON_CLIENT_FRAME_VIEW_H_ -#define CHROME_BROWSER_VIEWS_FRAME_POPUP_NON_CLIENT_FRAME_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/frame/popup_non_client_frame_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FRAME_POPUP_NON_CLIENT_FRAME_VIEW_H_ - diff --git a/chrome/browser/views/fullscreen_exit_bubble.h b/chrome/browser/views/fullscreen_exit_bubble.h deleted file mode 100644 index fc71d5c..0000000 --- a/chrome/browser/views/fullscreen_exit_bubble.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_FULLSCREEN_EXIT_BUBBLE_H_ -#define CHROME_BROWSER_VIEWS_FULLSCREEN_EXIT_BUBBLE_H_ -#pragma once - -#include "chrome/browser/ui/views/fullscreen_exit_bubble.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_FULLSCREEN_EXIT_BUBBLE_H_ - diff --git a/chrome/browser/views/generic_info_view.h b/chrome/browser/views/generic_info_view.h deleted file mode 100644 index 014ae18..0000000 --- a/chrome/browser/views/generic_info_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_GENERIC_INFO_VIEW_H_ -#define CHROME_BROWSER_VIEWS_GENERIC_INFO_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/generic_info_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_GENERIC_INFO_VIEW_H_ - diff --git a/chrome/browser/views/html_dialog_view.h b/chrome/browser/views/html_dialog_view.h deleted file mode 100644 index c26c76a..0000000 --- a/chrome/browser/views/html_dialog_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_HTML_DIALOG_VIEW_H_ -#define CHROME_BROWSER_VIEWS_HTML_DIALOG_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/html_dialog_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_HTML_DIALOG_VIEW_H_ - diff --git a/chrome/browser/views/importer_lock_view.h b/chrome/browser/views/importer_lock_view.h deleted file mode 100644 index 1c64d40..0000000 --- a/chrome/browser/views/importer_lock_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_IMPORTER_LOCK_VIEW_H_ -#define CHROME_BROWSER_IMPORTER_LOCK_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/importer_lock_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_IMPORTER_LOCK_VIEW_H_ - diff --git a/chrome/browser/views/importer_view.h b/chrome/browser/views/importer_view.h deleted file mode 100644 index 44afa36..0000000 --- a/chrome/browser/views/importer_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_IMPORTER_VIEW_H_ -#define CHROME_BROWSER_VIEWS_IMPORTER_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/importer_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_IMPORTER_VIEW_H_ - diff --git a/chrome/browser/views/importing_progress_view.h b/chrome/browser/views/importing_progress_view.h deleted file mode 100644 index 5805c52..0000000 --- a/chrome/browser/views/importing_progress_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_IMPORTING_PROGRESS_VIEW_H_ -#define CHROME_BROWSER_VIEWS_IMPORTING_PROGRESS_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/importing_progress_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_IMPORTING_PROGRESS_VIEW_H_ - diff --git a/chrome/browser/views/indexed_db_info_view.h b/chrome/browser/views/indexed_db_info_view.h deleted file mode 100644 index 6f2ccb4..0000000 --- a/chrome/browser/views/indexed_db_info_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_INDEXED_DB_INFO_VIEW_H_ -#define CHROME_BROWSER_VIEWS_INDEXED_DB_INFO_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/indexed_db_info_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_INDEXED_DB_INFO_VIEW_H_ - diff --git a/chrome/browser/views/info_bubble.h b/chrome/browser/views/info_bubble.h deleted file mode 100644 index bd7dba6..0000000 --- a/chrome/browser/views/info_bubble.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_INFO_BUBBLE_H_ -#define CHROME_BROWSER_VIEWS_INFO_BUBBLE_H_ -#pragma once - -#include "chrome/browser/ui/views/info_bubble.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_INFO_BUBBLE_H_ - diff --git a/chrome/browser/views/infobars/after_translate_infobar.h b/chrome/browser/views/infobars/after_translate_infobar.h deleted file mode 100644 index d0c8fcc..0000000 --- a/chrome/browser/views/infobars/after_translate_infobar.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_INFOBARS_AFTER_TRANSLATE_INFOBAR_H_ -#define CHROME_BROWSER_VIEWS_INFOBARS_AFTER_TRANSLATE_INFOBAR_H_ -#pragma once - -#include "chrome/browser/ui/views/infobars/after_translate_infobar.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_INFOBARS_AFTER_TRANSLATE_INFOBAR_H_ - diff --git a/chrome/browser/views/infobars/before_translate_infobar.h b/chrome/browser/views/infobars/before_translate_infobar.h deleted file mode 100644 index 1cf685c..0000000 --- a/chrome/browser/views/infobars/before_translate_infobar.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_INFOBARS_BEFORE_TRANSLATE_INFOBAR_H_ -#define CHROME_BROWSER_VIEWS_INFOBARS_BEFORE_TRANSLATE_INFOBAR_H_ -#pragma once - -#include "chrome/browser/ui/views/infobars/before_translate_infobar.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_INFOBARS_BEFORE_TRANSLATE_INFOBAR_H_ - diff --git a/chrome/browser/views/infobars/extension_infobar.h b/chrome/browser/views/infobars/extension_infobar.h deleted file mode 100644 index 0b1ae4a..0000000 --- a/chrome/browser/views/infobars/extension_infobar.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_ -#define CHROME_BROWSER_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_ -#pragma once - -#include "chrome/browser/ui/views/infobars/extension_infobar.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_ - diff --git a/chrome/browser/views/infobars/infobar_button_border.h b/chrome/browser/views/infobars/infobar_button_border.h deleted file mode 100644 index daafb16..0000000 --- a/chrome/browser/views/infobars/infobar_button_border.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_BUTTON_BORDER_H_ -#define CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_BUTTON_BORDER_H_ -#pragma once - -#include "chrome/browser/ui/views/infobars/infobar_button_border.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_BUTTON_BORDER_H_ - diff --git a/chrome/browser/views/infobars/infobar_container.h b/chrome/browser/views/infobars/infobar_container.h deleted file mode 100644 index 13c3f56..0000000 --- a/chrome/browser/views/infobars/infobar_container.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_ -#define CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_ -#pragma once - -#include "chrome/browser/ui/views/infobars/infobar_container.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_ - diff --git a/chrome/browser/views/infobars/infobar_text_button.h b/chrome/browser/views/infobars/infobar_text_button.h deleted file mode 100644 index 7255f0d..0000000 --- a/chrome/browser/views/infobars/infobar_text_button.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_TEXT_BUTTON_H_ -#define CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_TEXT_BUTTON_H_ -#pragma once - -#include "chrome/browser/ui/views/infobars/infobar_text_button.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_TEXT_BUTTON_H_ - diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h deleted file mode 100644 index 9345bdc..0000000 --- a/chrome/browser/views/infobars/infobars.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_ -#define CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_ -#pragma once - -#include "chrome/browser/ui/views/infobars/infobars.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_ - diff --git a/chrome/browser/views/infobars/translate_infobar_base.h b/chrome/browser/views/infobars/translate_infobar_base.h deleted file mode 100644 index 84b68dc..0000000 --- a/chrome/browser/views/infobars/translate_infobar_base.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_INFOBARS_TRANSLATE_INFOBAR_BASE_H_ -#define CHROME_BROWSER_VIEWS_INFOBARS_TRANSLATE_INFOBAR_BASE_H_ -#pragma once - -#include "chrome/browser/ui/views/infobars/translate_infobar_base.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_INFOBARS_TRANSLATE_INFOBAR_BASE_H_ - diff --git a/chrome/browser/views/infobars/translate_message_infobar.h b/chrome/browser/views/infobars/translate_message_infobar.h deleted file mode 100644 index d893fe7..0000000 --- a/chrome/browser/views/infobars/translate_message_infobar.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_INFOBARS_TRANSLATE_MESSAGE_INFOBAR_H_ -#define CHROME_BROWSER_VIEWS_INFOBARS_TRANSLATE_MESSAGE_INFOBAR_H_ -#pragma once - -#include "chrome/browser/ui/views/infobars/translate_message_infobar.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_INFOBARS_TRANSLATE_MESSAGE_INFOBAR_H_ - diff --git a/chrome/browser/views/instant_confirm_view.h b/chrome/browser/views/instant_confirm_view.h deleted file mode 100644 index d0f87d4..0000000 --- a/chrome/browser/views/instant_confirm_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_INSTANT_CONFIRM_VIEW_H_ -#define CHROME_BROWSER_VIEWS_INSTANT_CONFIRM_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/instant_confirm_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_INSTANT_CONFIRM_VIEW_H_ - diff --git a/chrome/browser/views/js_modal_dialog_views.h b/chrome/browser/views/js_modal_dialog_views.h deleted file mode 100644 index a5c6425..0000000 --- a/chrome/browser/views/js_modal_dialog_views.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_JS_MODAL_DIALOG_VIEWS_H_ -#define CHROME_BROWSER_VIEWS_JS_MODAL_DIALOG_VIEWS_H_ -#pragma once - -#include "chrome/browser/ui/views/js_modal_dialog_views.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_JS_MODAL_DIALOG_VIEWS_H_ - diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h deleted file mode 100644 index a3f5b8f..0000000 --- a/chrome/browser/views/keyword_editor_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_KEYWORD_EDITOR_VIEW_H_ -#define CHROME_BROWSER_VIEWS_KEYWORD_EDITOR_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/keyword_editor_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_KEYWORD_EDITOR_VIEW_H_ - diff --git a/chrome/browser/views/list_background.h b/chrome/browser/views/list_background.h deleted file mode 100644 index 4cf550b..0000000 --- a/chrome/browser/views/list_background.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LIST_BACKGROUND_H_ -#define CHROME_BROWSER_VIEWS_LIST_BACKGROUND_H_ -#pragma once - -#include "chrome/browser/ui/views/list_background.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LIST_BACKGROUND_H_ - diff --git a/chrome/browser/views/local_storage_info_view.h b/chrome/browser/views/local_storage_info_view.h deleted file mode 100644 index 3550959..0000000 --- a/chrome/browser/views/local_storage_info_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/local_storage_info_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_ - diff --git a/chrome/browser/views/local_storage_set_item_info_view.h b/chrome/browser/views/local_storage_set_item_info_view.h deleted file mode 100644 index ee16aaa..0000000 --- a/chrome/browser/views/local_storage_set_item_info_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCAL_STORAGE_SET_ITEM_INFO_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOCAL_STORAGE_SET_ITEM_INFO_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/local_storage_set_item_info_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCAL_STORAGE_SET_ITEM_INFO_VIEW_H_ - diff --git a/chrome/browser/views/location_bar/click_handler.h b/chrome/browser/views/location_bar/click_handler.h deleted file mode 100644 index 155e501f..0000000 --- a/chrome/browser/views/location_bar/click_handler.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_CLICK_HANDLER_H_ -#define CHROME_BROWSER_VIEWS_LOCATION_BAR_CLICK_HANDLER_H_ -#pragma once - -#include "chrome/browser/ui/views/location_bar/click_handler.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_CLICK_HANDLER_H_ - diff --git a/chrome/browser/views/location_bar/content_setting_image_view.h b/chrome/browser/views/location_bar/content_setting_image_view.h deleted file mode 100644 index 1bcb7bf..0000000 --- a/chrome/browser/views/location_bar/content_setting_image_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/location_bar/content_setting_image_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ - diff --git a/chrome/browser/views/location_bar/ev_bubble_view.h b/chrome/browser/views/location_bar/ev_bubble_view.h deleted file mode 100644 index 1070a6b..0000000 --- a/chrome/browser/views/location_bar/ev_bubble_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_EV_BUBBLE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOCATION_BAR_EV_BUBBLE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/location_bar/ev_bubble_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_EV_BUBBLE_VIEW_H_ - diff --git a/chrome/browser/views/location_bar/icon_label_bubble_view.h b/chrome/browser/views/location_bar/icon_label_bubble_view.h deleted file mode 100644 index 9e3dde6..0000000 --- a/chrome/browser/views/location_bar/icon_label_bubble_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_ - diff --git a/chrome/browser/views/location_bar/keyword_hint_view.h b/chrome/browser/views/location_bar/keyword_hint_view.h deleted file mode 100644 index defea0e..0000000 --- a/chrome/browser/views/location_bar/keyword_hint_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_KEYWORD_HINT_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOCATION_BAR_KEYWORD_HINT_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_KEYWORD_HINT_VIEW_H_ - diff --git a/chrome/browser/views/location_bar/location_bar_view.h b/chrome/browser/views/location_bar/location_bar_view.h deleted file mode 100644 index 1e2b2d7..0000000 --- a/chrome/browser/views/location_bar/location_bar_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/location_bar/location_bar_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ - diff --git a/chrome/browser/views/location_bar/location_icon_view.h b/chrome/browser/views/location_bar/location_icon_view.h deleted file mode 100644 index d0de238..0000000 --- a/chrome/browser/views/location_bar/location_icon_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/location_bar/location_icon_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_ - diff --git a/chrome/browser/views/location_bar/page_action_image_view.h b/chrome/browser/views/location_bar/page_action_image_view.h deleted file mode 100644 index aa01f4d..0000000 --- a/chrome/browser/views/location_bar/page_action_image_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/location_bar/page_action_image_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ - diff --git a/chrome/browser/views/location_bar/page_action_with_badge_view.h b/chrome/browser/views/location_bar/page_action_with_badge_view.h deleted file mode 100644 index 4bdc71e..0000000 --- a/chrome/browser/views/location_bar/page_action_with_badge_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_ - diff --git a/chrome/browser/views/location_bar/selected_keyword_view.h b/chrome/browser/views/location_bar/selected_keyword_view.h deleted file mode 100644 index bce29d0..0000000 --- a/chrome/browser/views/location_bar/selected_keyword_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_SELECTED_KEYWORD_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOCATION_BAR_SELECTED_KEYWORD_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_SELECTED_KEYWORD_VIEW_H_ - diff --git a/chrome/browser/views/location_bar/star_view.h b/chrome/browser/views/location_bar/star_view.h deleted file mode 100644 index a964d14..0000000 --- a/chrome/browser/views/location_bar/star_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_STAR_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOCATION_BAR_STAR_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/location_bar/star_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_STAR_VIEW_H_ - diff --git a/chrome/browser/views/login_view.h b/chrome/browser/views/login_view.h deleted file mode 100644 index bb45e10..0000000 --- a/chrome/browser/views/login_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_LOGIN_VIEW_H_ -#define CHROME_BROWSER_VIEWS_LOGIN_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/login_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_LOGIN_VIEW_H_ - diff --git a/chrome/browser/views/modal_dialog_delegate.h b/chrome/browser/views/modal_dialog_delegate.h deleted file mode 100644 index 06cba14..0000000 --- a/chrome/browser/views/modal_dialog_delegate.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_MODAL_DIALOG_DELEGATE_H_ -#define CHROME_BROWSER_VIEWS_MODAL_DIALOG_DELEGATE_H_ -#pragma once - -#include "chrome/browser/ui/views/modal_dialog_delegate.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_MODAL_DIALOG_DELEGATE_H_ - diff --git a/chrome/browser/views/notifications/balloon_view.h b/chrome/browser/views/notifications/balloon_view.h deleted file mode 100644 index 2896feb..0000000 --- a/chrome/browser/views/notifications/balloon_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_H_ -#define CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/notifications/balloon_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_H_ - diff --git a/chrome/browser/views/notifications/balloon_view_host.h b/chrome/browser/views/notifications/balloon_view_host.h deleted file mode 100644 index 2c1a302..0000000 --- a/chrome/browser/views/notifications/balloon_view_host.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_HOST_H_ -#define CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_HOST_H_ -#pragma once - -#include "chrome/browser/ui/views/notifications/balloon_view_host.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_HOST_H_ - diff --git a/chrome/browser/views/options/advanced_contents_view.h b/chrome/browser/views/options/advanced_contents_view.h deleted file mode 100644 index 9026e82..0000000 --- a/chrome/browser/views/options/advanced_contents_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_CONTENTS_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_CONTENTS_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/advanced_contents_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_CONTENTS_VIEW_H_ - diff --git a/chrome/browser/views/options/advanced_page_view.h b/chrome/browser/views/options/advanced_page_view.h deleted file mode 100644 index dccd66e..0000000 --- a/chrome/browser/views/options/advanced_page_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_PAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_PAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/advanced_page_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_PAGE_VIEW_H_ - diff --git a/chrome/browser/views/options/content_exceptions_table_view.h b/chrome/browser/views/options/content_exceptions_table_view.h deleted file mode 100644 index 6cc48fb..0000000 --- a/chrome/browser/views/options/content_exceptions_table_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_EXCEPTIONS_TABLE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_EXCEPTIONS_TABLE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/content_exceptions_table_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_EXCEPTIONS_TABLE_VIEW_H_ - diff --git a/chrome/browser/views/options/content_filter_page_view.h b/chrome/browser/views/options/content_filter_page_view.h deleted file mode 100644 index 0a1115e..0000000 --- a/chrome/browser/views/options/content_filter_page_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_FILTER_PAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_FILTER_PAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/content_filter_page_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_FILTER_PAGE_VIEW_H_ - diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h deleted file mode 100644 index 1335775..0000000 --- a/chrome/browser/views/options/content_page_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_PAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_PAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/content_page_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_PAGE_VIEW_H_ - diff --git a/chrome/browser/views/options/content_settings_window_view.h b/chrome/browser/views/options/content_settings_window_view.h deleted file mode 100644 index a3bc919..0000000 --- a/chrome/browser/views/options/content_settings_window_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_SETTINGS_WINDOW_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_SETTINGS_WINDOW_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/content_settings_window_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_SETTINGS_WINDOW_VIEW_H_ - diff --git a/chrome/browser/views/options/cookie_filter_page_view.h b/chrome/browser/views/options/cookie_filter_page_view.h deleted file mode 100644 index 3168e0e..0000000 --- a/chrome/browser/views/options/cookie_filter_page_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_COOKIE_FILTER_PAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_COOKIE_FILTER_PAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/cookie_filter_page_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_COOKIE_FILTER_PAGE_VIEW_H_ - diff --git a/chrome/browser/views/options/cookies_view.h b/chrome/browser/views/options/cookies_view.h deleted file mode 100644 index dd74019..0000000 --- a/chrome/browser/views/options/cookies_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/cookies_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_ - diff --git a/chrome/browser/views/options/exception_editor_view.h b/chrome/browser/views/options/exception_editor_view.h deleted file mode 100644 index fb63617..0000000 --- a/chrome/browser/views/options/exception_editor_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTION_EDITOR_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTION_EDITOR_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/exception_editor_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTION_EDITOR_VIEW_H_ - diff --git a/chrome/browser/views/options/exceptions_page_view.h b/chrome/browser/views/options/exceptions_page_view.h deleted file mode 100644 index c9eab58..0000000 --- a/chrome/browser/views/options/exceptions_page_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_PAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_PAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/exceptions_page_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_PAGE_VIEW_H_ - diff --git a/chrome/browser/views/options/exceptions_view.h b/chrome/browser/views/options/exceptions_view.h deleted file mode 100644 index 6ff6f02..0000000 --- a/chrome/browser/views/options/exceptions_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/exceptions_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_VIEW_H_ - diff --git a/chrome/browser/views/options/fonts_languages_window_view.h b/chrome/browser/views/options/fonts_languages_window_view.h deleted file mode 100644 index 1702d9a..0000000 --- a/chrome/browser/views/options/fonts_languages_window_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_FONTS_LANGUAGES_WINDOW_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_FONTS_LANGUAGES_WINDOW_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/fonts_languages_window_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_FONTS_LANGUAGES_WINDOW_VIEW_H_ - diff --git a/chrome/browser/views/options/fonts_page_view.h b/chrome/browser/views/options/fonts_page_view.h deleted file mode 100644 index 22cad00..0000000 --- a/chrome/browser/views/options/fonts_page_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/fonts_page_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_ - diff --git a/chrome/browser/views/options/general_page_view.h b/chrome/browser/views/options/general_page_view.h deleted file mode 100644 index f9072e1..0000000 --- a/chrome/browser/views/options/general_page_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/general_page_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_ - diff --git a/chrome/browser/views/options/languages_page_view.h b/chrome/browser/views/options/languages_page_view.h deleted file mode 100644 index 722a893..0000000 --- a/chrome/browser/views/options/languages_page_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_LANGUAGES_PAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_LANGUAGES_PAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/languages_page_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_LANGUAGES_PAGE_VIEW_H_ - diff --git a/chrome/browser/views/options/managed_prefs_banner_view.h b/chrome/browser/views/options/managed_prefs_banner_view.h deleted file mode 100644 index d1efb86..0000000 --- a/chrome/browser/views/options/managed_prefs_banner_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_MANAGED_PREFS_BANNER_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_MANAGED_PREFS_BANNER_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/managed_prefs_banner_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_MANAGED_PREFS_BANNER_VIEW_H_ - diff --git a/chrome/browser/views/options/options_group_view.h b/chrome/browser/views/options/options_group_view.h deleted file mode 100644 index b3bf71b..0000000 --- a/chrome/browser/views/options/options_group_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/options_group_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H_ - diff --git a/chrome/browser/views/options/options_page_view.h b/chrome/browser/views/options/options_page_view.h deleted file mode 100644 index 2920edb..0000000 --- a/chrome/browser/views/options/options_page_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_PAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_PAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/options_page_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_PAGE_VIEW_H_ - diff --git a/chrome/browser/views/options/passwords_exceptions_window_view.h b/chrome/browser/views/options/passwords_exceptions_window_view.h deleted file mode 100644 index 7adbd5f..0000000 --- a/chrome/browser/views/options/passwords_exceptions_window_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/passwords_exceptions_window_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_VIEW_H_ - diff --git a/chrome/browser/views/options/passwords_page_view.h b/chrome/browser/views/options/passwords_page_view.h deleted file mode 100644 index 2c4612a..0000000 --- a/chrome/browser/views/options/passwords_page_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_PAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_PAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/passwords_page_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_PAGE_VIEW_H_ - diff --git a/chrome/browser/views/options/plugin_filter_page_view.h b/chrome/browser/views/options/plugin_filter_page_view.h deleted file mode 100644 index d1d4086..0000000 --- a/chrome/browser/views/options/plugin_filter_page_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_PLUGIN_FILTER_PAGE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_PLUGIN_FILTER_PAGE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/plugin_filter_page_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_PLUGIN_FILTER_PAGE_VIEW_H_ - diff --git a/chrome/browser/views/options/simple_content_exceptions_view.h b/chrome/browser/views/options/simple_content_exceptions_view.h deleted file mode 100644 index 6b89cd9..0000000 --- a/chrome/browser/views/options/simple_content_exceptions_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_OPTIONS_SIMPLE_CONTENT_EXCEPTIONS_VIEW_H_ -#define CHROME_BROWSER_VIEWS_OPTIONS_SIMPLE_CONTENT_EXCEPTIONS_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/options/simple_content_exceptions_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_OPTIONS_SIMPLE_CONTENT_EXCEPTIONS_VIEW_H_ - diff --git a/chrome/browser/views/page_info_bubble_view.h b/chrome/browser/views/page_info_bubble_view.h deleted file mode 100644 index cb920bb..0000000 --- a/chrome/browser/views/page_info_bubble_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_PAGE_INFO_BUBBLE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_PAGE_INFO_BUBBLE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/page_info_bubble_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_PAGE_INFO_BUBBLE_VIEW_H_ - diff --git a/chrome/browser/views/pinned_contents_info_bubble.h b/chrome/browser/views/pinned_contents_info_bubble.h deleted file mode 100644 index a2af973..0000000 --- a/chrome/browser/views/pinned_contents_info_bubble.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_PINNED_CONTENTS_INFO_BUBBLE_H_ -#define CHROME_BROWSER_VIEWS_PINNED_CONTENTS_INFO_BUBBLE_H_ -#pragma once - -#include "chrome/browser/ui/views/pinned_contents_info_bubble.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_PINNED_CONTENTS_INFO_BUBBLE_H_ - diff --git a/chrome/browser/views/reload_button.h b/chrome/browser/views/reload_button.h deleted file mode 100644 index 71118e1..0000000 --- a/chrome/browser/views/reload_button.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_RELOAD_BUTTON_H_ -#define CHROME_BROWSER_VIEWS_RELOAD_BUTTON_H_ -#pragma once - -#include "chrome/browser/ui/views/reload_button.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_RELOAD_BUTTON_H_ - diff --git a/chrome/browser/views/repost_form_warning_view.h b/chrome/browser/views/repost_form_warning_view.h deleted file mode 100644 index 1dd6888..0000000 --- a/chrome/browser/views/repost_form_warning_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_REPOST_FORM_WARNING_VIEW_H_ -#define CHROME_BROWSER_VIEWS_REPOST_FORM_WARNING_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/repost_form_warning_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_REPOST_FORM_WARNING_VIEW_H_ - diff --git a/chrome/browser/views/restart_message_box.h b/chrome/browser/views/restart_message_box.h deleted file mode 100644 index 1547e92..0000000 --- a/chrome/browser/views/restart_message_box.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_RESTART_MESSAGE_BOX_H_ -#define CHROME_BROWSER_VIEWS_RESTART_MESSAGE_BOX_H_ -#pragma once - -#include "chrome/browser/ui/views/restart_message_box.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_RESTART_MESSAGE_BOX_H_ - diff --git a/chrome/browser/views/sad_tab_view.h b/chrome/browser/views/sad_tab_view.h deleted file mode 100644 index f21d8e8..0000000 --- a/chrome/browser/views/sad_tab_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_SAD_TAB_VIEW_H_ -#define CHROME_BROWSER_VIEWS_SAD_TAB_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/sad_tab_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_SAD_TAB_VIEW_H_ - diff --git a/chrome/browser/views/status_bubble_views.h b/chrome/browser/views/status_bubble_views.h deleted file mode 100644 index 3d10bd4..0000000 --- a/chrome/browser/views/status_bubble_views.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_STATUS_BUBBLE_VIEWS_H_ -#define CHROME_BROWSER_VIEWS_STATUS_BUBBLE_VIEWS_H_ -#pragma once - -#include "chrome/browser/ui/views/status_bubble_views.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_STATUS_BUBBLE_VIEWS_H_ - diff --git a/chrome/browser/views/status_icons/status_icon_win.h b/chrome/browser/views/status_icons/status_icon_win.h deleted file mode 100644 index 1f7ce62..0000000 --- a/chrome/browser/views/status_icons/status_icon_win.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_ -#define CHROME_BROWSER_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_ -#pragma once - -#include "chrome/browser/ui/views/status_icons/status_icon_win.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_ - diff --git a/chrome/browser/views/status_icons/status_tray_win.h b/chrome/browser/views/status_icons/status_tray_win.h deleted file mode 100644 index 7d7f301..0000000 --- a/chrome/browser/views/status_icons/status_tray_win.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_ -#define CHROME_BROWSER_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_ -#pragma once - -#include "chrome/browser/ui/views/status_icons/status_tray_win.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_ - diff --git a/chrome/browser/views/tab_contents/native_tab_contents_container.h b/chrome/browser/views/tab_contents/native_tab_contents_container.h deleted file mode 100644 index 7f2cdfc..0000000 --- a/chrome/browser/views/tab_contents/native_tab_contents_container.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_H_ -#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_H_ -#pragma once - -#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_H_ - diff --git a/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.h b/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.h deleted file mode 100644 index cab3c2b..0000000 --- a/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_GTK_H_ -#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_GTK_H_ -#pragma once - -#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_GTK_H_ - diff --git a/chrome/browser/views/tab_contents/native_tab_contents_container_win.h b/chrome/browser/views/tab_contents/native_tab_contents_container_win.h deleted file mode 100644 index 5418181..0000000 --- a/chrome/browser/views/tab_contents/native_tab_contents_container_win.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_WIN_H_ -#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_WIN_H_ -#pragma once - -#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_WIN_H_ - diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_views.h b/chrome/browser/views/tab_contents/render_view_context_menu_views.h deleted file mode 100644 index 98e610d..0000000 --- a/chrome/browser/views/tab_contents/render_view_context_menu_views.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_VIEWS_H_ -#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_VIEWS_H_ -#pragma once - -#include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_VIEWS_H_ - diff --git a/chrome/browser/views/tab_contents/tab_contents_container.h b/chrome/browser/views/tab_contents/tab_contents_container.h deleted file mode 100644 index 9039060..0000000 --- a/chrome/browser/views/tab_contents/tab_contents_container.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_H_ -#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_H_ -#pragma once - -#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_H_ - diff --git a/chrome/browser/views/tab_contents/tab_contents_drag_win.h b/chrome/browser/views/tab_contents/tab_contents_drag_win.h deleted file mode 100644 index 79067eb..0000000 --- a/chrome/browser/views/tab_contents/tab_contents_drag_win.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_DRAG_WIN_H_ -#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_DRAG_WIN_H_ -#pragma once - -#include "chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_DRAG_WIN_H_ - diff --git a/chrome/browser/views/tab_contents/tab_contents_view_gtk.h b/chrome/browser/views/tab_contents/tab_contents_view_gtk.h deleted file mode 100644 index 3ee3e9a..0000000 --- a/chrome/browser/views/tab_contents/tab_contents_view_gtk.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_ -#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_ -#pragma once - -#include "chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_ - diff --git a/chrome/browser/views/tab_contents/tab_contents_view_win.h b/chrome/browser/views/tab_contents/tab_contents_view_win.h deleted file mode 100644 index 49f6a13..0000000 --- a/chrome/browser/views/tab_contents/tab_contents_view_win.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_ -#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_ -#pragma once - -#include "chrome/browser/ui/views/tab_contents/tab_contents_view_win.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_ - diff --git a/chrome/browser/views/tab_icon_view.h b/chrome/browser/views/tab_icon_view.h deleted file mode 100644 index 064c8a7..0000000 --- a/chrome/browser/views/tab_icon_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TAB_ICON_VIEW_H_ -#define CHROME_BROWSER_VIEWS_TAB_ICON_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/tab_icon_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TAB_ICON_VIEW_H_ - diff --git a/chrome/browser/views/tabs/base_tab.h b/chrome/browser/views/tabs/base_tab.h deleted file mode 100644 index e826fbf..0000000 --- a/chrome/browser/views/tabs/base_tab.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_BASE_TAB_H_ -#define CHROME_BROWSER_VIEWS_TABS_BASE_TAB_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/base_tab.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_BASE_TAB_H_ - diff --git a/chrome/browser/views/tabs/base_tab_strip.h b/chrome/browser/views/tabs/base_tab_strip.h deleted file mode 100644 index 603dcf9..0000000 --- a/chrome/browser/views/tabs/base_tab_strip.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_BASE_TAB_STRIP_H_ -#define CHROME_BROWSER_VIEWS_TABS_BASE_TAB_STRIP_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/base_tab_strip.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_BASE_TAB_STRIP_H_ - diff --git a/chrome/browser/views/tabs/browser_tab_strip_controller.h b/chrome/browser/views/tabs/browser_tab_strip_controller.h deleted file mode 100644 index 6606f28..0000000 --- a/chrome/browser/views/tabs/browser_tab_strip_controller.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_ -#define CHROME_BROWSER_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_ - diff --git a/chrome/browser/views/tabs/dragged_tab_controller.h b/chrome/browser/views/tabs/dragged_tab_controller.h deleted file mode 100644 index e445018..0000000 --- a/chrome/browser/views/tabs/dragged_tab_controller.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_ -#define CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/dragged_tab_controller.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_ - diff --git a/chrome/browser/views/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h deleted file mode 100644 index 2848baf..0000000 --- a/chrome/browser/views/tabs/dragged_tab_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_ -#define CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/dragged_tab_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_ - diff --git a/chrome/browser/views/tabs/native_view_photobooth.h b/chrome/browser/views/tabs/native_view_photobooth.h deleted file mode 100644 index 1a954e5..0000000 --- a/chrome/browser/views/tabs/native_view_photobooth.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_ -#define CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/native_view_photobooth.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_ - diff --git a/chrome/browser/views/tabs/native_view_photobooth_gtk.h b/chrome/browser/views/tabs/native_view_photobooth_gtk.h deleted file mode 100644 index 22c3901..0000000 --- a/chrome/browser/views/tabs/native_view_photobooth_gtk.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_GTK_H_ -#define CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_GTK_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/native_view_photobooth_gtk.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_GTK_H_ - diff --git a/chrome/browser/views/tabs/native_view_photobooth_win.h b/chrome/browser/views/tabs/native_view_photobooth_win.h deleted file mode 100644 index 2cd2a4b..0000000 --- a/chrome/browser/views/tabs/native_view_photobooth_win.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_WIN_H_ -#define CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_WIN_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/native_view_photobooth_win.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_WIN_H_ - diff --git a/chrome/browser/views/tabs/side_tab.h b/chrome/browser/views/tabs/side_tab.h deleted file mode 100644 index 5d27ce3..0000000 --- a/chrome/browser/views/tabs/side_tab.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_H_ -#define CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/side_tab.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_H_ - diff --git a/chrome/browser/views/tabs/side_tab_strip.h b/chrome/browser/views/tabs/side_tab_strip.h deleted file mode 100644 index cbecf20..0000000 --- a/chrome/browser/views/tabs/side_tab_strip.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_STRIP_H_ -#define CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_STRIP_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/side_tab_strip.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_STRIP_H_ - diff --git a/chrome/browser/views/tabs/tab.h b/chrome/browser/views/tabs/tab.h deleted file mode 100644 index 11076c1..0000000 --- a/chrome/browser/views/tabs/tab.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_H_ -#define CHROME_BROWSER_VIEWS_TABS_TAB_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/tab.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_TAB_H_ - diff --git a/chrome/browser/views/tabs/tab_controller.h b/chrome/browser/views/tabs/tab_controller.h deleted file mode 100644 index 5205f5e..0000000 --- a/chrome/browser/views/tabs/tab_controller.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_CONTROLLER_H_ -#define CHROME_BROWSER_VIEWS_TABS_TAB_CONTROLLER_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/tab_controller.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_TAB_CONTROLLER_H_ - diff --git a/chrome/browser/views/tabs/tab_renderer_data.h b/chrome/browser/views/tabs/tab_renderer_data.h deleted file mode 100644 index dca47c9..0000000 --- a/chrome/browser/views/tabs/tab_renderer_data.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_DATA_H_ -#define CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_DATA_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/tab_renderer_data.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_DATA_H_ - diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h deleted file mode 100644 index 4c24f8c..0000000 --- a/chrome/browser/views/tabs/tab_strip.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_ -#define CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/tab_strip.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_ - diff --git a/chrome/browser/views/tabs/tab_strip_controller.h b/chrome/browser/views/tabs/tab_strip_controller.h deleted file mode 100644 index b0c7be9..0000000 --- a/chrome/browser/views/tabs/tab_strip_controller.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_CONTROLLER_H_ -#define CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_CONTROLLER_H_ -#pragma once - -#include "chrome/browser/ui/views/tabs/tab_strip_controller.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_CONTROLLER_H_ - diff --git a/chrome/browser/views/textfield_views.h b/chrome/browser/views/textfield_views.h deleted file mode 100644 index 3b699f0..0000000 --- a/chrome/browser/views/textfield_views.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TEXTFIELD_VIEWS_H_ -#define CHROME_BROWSER_VIEWS_TEXTFIELD_VIEWS_H_ -#pragma once - -#include "chrome/browser/ui/views/textfield_views.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TEXTFIELD_VIEWS_H_ - diff --git a/chrome/browser/views/theme_background.h b/chrome/browser/views/theme_background.h deleted file mode 100644 index 98ce8f6..0000000 --- a/chrome/browser/views/theme_background.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_THEME_BACKGROUND_H_ -#define CHROME_BROWSER_VIEWS_THEME_BACKGROUND_H_ -#pragma once - -#include "chrome/browser/ui/views/theme_background.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_THEME_BACKGROUND_H_ - diff --git a/chrome/browser/views/theme_helpers.h b/chrome/browser/views/theme_helpers.h deleted file mode 100644 index b7bd4f2..0000000 --- a/chrome/browser/views/theme_helpers.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_THEME_HELPERS_H_ -#define CHROME_BROWSER_VIEWS_THEME_HELPERS_H_ -#pragma once - -#include "chrome/browser/ui/views/theme_helpers.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_THEME_HELPERS_H_ - diff --git a/chrome/browser/views/theme_install_bubble_view.h b/chrome/browser/views/theme_install_bubble_view.h deleted file mode 100644 index b0eddec..0000000 --- a/chrome/browser/views/theme_install_bubble_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_THEME_INSTALL_BUBBLE_VIEW_H_ -#define CHROME_BROWSER_VIEWS_THEME_INSTALL_BUBBLE_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/theme_install_bubble_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_THEME_INSTALL_BUBBLE_VIEW_H_ - diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h deleted file mode 100644 index 647f721..0000000 --- a/chrome/browser/views/toolbar_view.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ -#define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ -#pragma once - - #include "chrome/browser/ui/views/toolbar_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ diff --git a/chrome/browser/views/unhandled_keyboard_event_handler.h b/chrome/browser/views/unhandled_keyboard_event_handler.h deleted file mode 100644 index a007663..0000000 --- a/chrome/browser/views/unhandled_keyboard_event_handler.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_UNHANDLED_KEYBOARD_EVENT_HANDLER_H_ -#define CHROME_BROWSER_VIEWS_UNHANDLED_KEYBOARD_EVENT_HANDLER_H_ -#pragma once - -#include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_UNHANDLED_KEYBOARD_EVENT_HANDLER_H_ - diff --git a/chrome/browser/views/uninstall_view.h b/chrome/browser/views/uninstall_view.h deleted file mode 100644 index e366791..0000000 --- a/chrome/browser/views/uninstall_view.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_UNINSTALL_VIEW_H_ -#define CHROME_BROWSER_VIEWS_UNINSTALL_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/views/uninstall_view.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_UNINSTALL_VIEW_H_ - diff --git a/chrome/browser/views/update_recommended_message_box.h b/chrome/browser/views/update_recommended_message_box.h deleted file mode 100644 index a5f589e..0000000 --- a/chrome/browser/views/update_recommended_message_box.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_UPDATE_RECOMMENDED_MESSAGE_BOX_H_ -#define CHROME_BROWSER_UPDATE_RECOMMENDED_MESSAGE_BOX_H_ -#pragma once - -#include "chrome/browser/ui/views/update_recommended_message_box.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_UPDATE_RECOMMENDED_MESSAGE_BOX_H_ - diff --git a/chrome/browser/views/url_picker.h b/chrome/browser/views/url_picker.h deleted file mode 100644 index c716ec5..0000000 --- a/chrome/browser/views/url_picker.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_URL_PICKER_H_ -#define CHROME_BROWSER_VIEWS_URL_PICKER_H_ -#pragma once - -#include "chrome/browser/ui/views/url_picker.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_URL_PICKER_H_ - diff --git a/chrome/browser/views/user_data_dir_dialog.h b/chrome/browser/views/user_data_dir_dialog.h deleted file mode 100644 index 3ca925d..0000000 --- a/chrome/browser/views/user_data_dir_dialog.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_USER_DATA_DIR_DIALOG_H_ -#define CHROME_BROWSER_VIEWS_USER_DATA_DIR_DIALOG_H_ -#pragma once - -#include "chrome/browser/ui/views/user_data_dir_dialog.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_USER_DATA_DIR_DIALOG_H_ - diff --git a/chrome/browser/views/window.h b/chrome/browser/views/window.h deleted file mode 100644 index 9733676..0000000 --- a/chrome/browser/views/window.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_WINDOW_H_ -#define CHROME_BROWSER_VIEWS_WINDOW_H_ -#pragma once - -#include "chrome/browser/ui/views/window.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_WINDOW_H_ - diff --git a/chrome/browser/views/wrench_menu.h b/chrome/browser/views/wrench_menu.h deleted file mode 100644 index 1a2c52b..0000000 --- a/chrome/browser/views/wrench_menu.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_VIEWS_WRENCH_MENU_H_ -#define CHROME_BROWSER_VIEWS_WRENCH_MENU_H_ -#pragma once - -#include "chrome/browser/ui/views/wrench_menu.h" -// TODO(beng): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_VIEWS_WRENCH_MENU_H_ - diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index ff428c9..5401349 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -46,7 +46,7 @@ #endif #if defined(OS_WIN) -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #endif namespace { diff --git a/chrome/test/ui_test_utils_linux.cc b/chrome/test/ui_test_utils_linux.cc index 0692f55..bf53d57 100644 --- a/chrome/test/ui_test_utils_linux.cc +++ b/chrome/test/ui_test_utils_linux.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,7 +13,7 @@ #include "chrome/browser/gtk/view_id_util.h" #include "chrome/browser/ui/browser.h" #if defined(TOOLKIT_VIEWS) -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "views/focus/focus_manager.h" #endif diff --git a/chrome/test/ui_test_utils_win.cc b/chrome/test/ui_test_utils_win.cc index d46ccf9..c19e128 100644 --- a/chrome/test/ui_test_utils_win.cc +++ b/chrome/test/ui_test_utils_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include "chrome/browser/automation/ui_controls.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "views/focus/focus_manager.h" namespace ui_test_utils { |