diff options
Diffstat (limited to 'chrome/browser/ui/views/options')
34 files changed, 94 insertions, 94 deletions
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> |