diff options
82 files changed, 95 insertions, 394 deletions
diff --git a/chrome/browser/chromeos/webui/core_chromeos_options_handler.h b/chrome/browser/chromeos/webui/core_chromeos_options_handler.h index 66fe2fc..bfa9aee 100644 --- a/chrome/browser/chromeos/webui/core_chromeos_options_handler.h +++ b/chrome/browser/chromeos/webui/core_chromeos_options_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_WEBUI_CORE_CHROMEOS_OPTIONS_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/options/core_options_handler.h" +#include "chrome/browser/webui/options/core_options_handler.h" namespace chromeos { diff --git a/chrome/browser/chromeos/webui/cros_language_options_handler.h b/chrome/browser/chromeos/webui/cros_language_options_handler.h index 60972f6..ac0984a 100644 --- a/chrome/browser/chromeos/webui/cros_language_options_handler.h +++ b/chrome/browser/chromeos/webui/cros_language_options_handler.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/chromeos/input_method/input_method_util.h" -#include "chrome/browser/dom_ui/options/language_options_handler.h" +#include "chrome/browser/webui/options/language_options_handler.h" namespace chromeos { diff --git a/chrome/browser/chromeos/webui/cros_options_page_ui_handler.h b/chrome/browser/chromeos/webui/cros_options_page_ui_handler.h index 5946207..ece323e 100644 --- a/chrome/browser/chromeos/webui/cros_options_page_ui_handler.h +++ b/chrome/browser/chromeos/webui/cros_options_page_ui_handler.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/chromeos/cros_settings_provider.h" -#include "chrome/browser/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" namespace chromeos { diff --git a/chrome/browser/chromeos/webui/internet_options_handler.h b/chrome/browser/chromeos/webui/internet_options_handler.h index 7d62389..1b98b95 100644 --- a/chrome/browser/chromeos/webui/internet_options_handler.h +++ b/chrome/browser/chromeos/webui/internet_options_handler.h @@ -8,7 +8,7 @@ #include <string> #include "chrome/browser/chromeos/cros/network_library.h" -#include "chrome/browser/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" class SkBitmap; namespace views { diff --git a/chrome/browser/chromeos/webui/language_chewing_options_handler.h b/chrome/browser/chromeos/webui/language_chewing_options_handler.h index 3f3be2e..a512f94 100644 --- a/chrome/browser/chromeos/webui/language_chewing_options_handler.h +++ b/chrome/browser/chromeos/webui/language_chewing_options_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_CHEWING_OPTIONS_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" class DictionaryValue; diff --git a/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h b/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h index 798213b..cc513ff 100644 --- a/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h +++ b/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER_H_ // NOLINT #pragma once -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/webui/options/options_ui.h" namespace chromeos { diff --git a/chrome/browser/chromeos/webui/language_hangul_options_handler.h b/chrome/browser/chromeos/webui/language_hangul_options_handler.h index ba972a1..0ca1940 100644 --- a/chrome/browser/chromeos/webui/language_hangul_options_handler.h +++ b/chrome/browser/chromeos/webui/language_hangul_options_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_HANGUL_OPTIONS_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" class DictionaryValue; class ListValue; diff --git a/chrome/browser/chromeos/webui/language_mozc_options_handler.h b/chrome/browser/chromeos/webui/language_mozc_options_handler.h index f11ef85..4dc1521 100644 --- a/chrome/browser/chromeos/webui/language_mozc_options_handler.h +++ b/chrome/browser/chromeos/webui/language_mozc_options_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_MOZC_OPTIONS_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" class DictionaryValue; diff --git a/chrome/browser/chromeos/webui/language_pinyin_options_handler.h b/chrome/browser/chromeos/webui/language_pinyin_options_handler.h index bced1e4..c9c812c 100644 --- a/chrome/browser/chromeos/webui/language_pinyin_options_handler.h +++ b/chrome/browser/chromeos/webui/language_pinyin_options_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_PINYIN_OPTIONS_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" class DictionaryValue; diff --git a/chrome/browser/dom_ui/options/about_page_handler.h b/chrome/browser/dom_ui/options/about_page_handler.h deleted file mode 100644 index 09b96ff..0000000 --- a/chrome/browser/dom_ui/options/about_page_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_ABOUT_PAGE_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_ABOUT_PAGE_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/about_page_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_ABOUT_PAGE_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/add_startup_page_handler.h b/chrome/browser/dom_ui/options/add_startup_page_handler.h deleted file mode 100644 index e251bcf..0000000 --- a/chrome/browser/dom_ui/options/add_startup_page_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_ADD_STARTUP_PAGE_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_ADD_STARTUP_PAGE_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/add_startup_page_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_ADD_STARTUP_PAGE_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.h b/chrome/browser/dom_ui/options/advanced_options_handler.h deleted file mode 100644 index 4b61de1..0000000 --- a/chrome/browser/dom_ui/options/advanced_options_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/advanced_options_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/advanced_options_utils.h b/chrome/browser/dom_ui/options/advanced_options_utils.h deleted file mode 100644 index 7e9507c..0000000 --- a/chrome/browser/dom_ui/options/advanced_options_utils.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_ -#pragma once - -#include "chrome/browser/webui/options/advanced_options_utils.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_ diff --git a/chrome/browser/dom_ui/options/autofill_options_handler.h b/chrome/browser/dom_ui/options/autofill_options_handler.h deleted file mode 100644 index 26a7bfd..0000000 --- a/chrome/browser/dom_ui/options/autofill_options_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/autofill_options_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_AUTOFILL_OPTIONS_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/browser_options_handler.h b/chrome/browser/dom_ui/options/browser_options_handler.h deleted file mode 100644 index cef9920..0000000 --- a/chrome/browser/dom_ui/options/browser_options_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/browser_options_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/certificate_manager_handler.h b/chrome/browser/dom_ui/options/certificate_manager_handler.h deleted file mode 100644 index 1500337..0000000 --- a/chrome/browser/dom_ui/options/certificate_manager_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/certificate_manager_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/clear_browser_data_handler.h b/chrome/browser/dom_ui/options/clear_browser_data_handler.h deleted file mode 100644 index 873993f..0000000 --- a/chrome/browser/dom_ui/options/clear_browser_data_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/clear_browser_data_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/content_settings_handler.h b/chrome/browser/dom_ui/options/content_settings_handler.h deleted file mode 100644 index 85e67b4..0000000 --- a/chrome/browser/dom_ui/options/content_settings_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/content_settings_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/cookies_view_handler.h b/chrome/browser/dom_ui/options/cookies_view_handler.h deleted file mode 100644 index 73810a3c..0000000 --- a/chrome/browser/dom_ui/options/cookies_view_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_COOKIES_VIEW_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_COOKIES_VIEW_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/cookies_view_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_COOKIES_VIEW_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/core_options_handler.h b/chrome/browser/dom_ui/options/core_options_handler.h deleted file mode 100644 index 535aa25..0000000 --- a/chrome/browser/dom_ui/options/core_options_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_CORE_OPTIONS_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_CORE_OPTIONS_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/core_options_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_CORE_OPTIONS_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/dom_options_util.h b/chrome/browser/dom_ui/options/dom_options_util.h deleted file mode 100644 index beeebdb..0000000 --- a/chrome/browser/dom_ui/options/dom_options_util.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_DOM_OPTIONS_UTIL_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_DOM_OPTIONS_UTIL_H_ -#pragma once - -#include "chrome/browser/webui/options/dom_options_util.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_DOM_OPTIONS_UTIL_H_ diff --git a/chrome/browser/dom_ui/options/font_settings_handler.h b/chrome/browser/dom_ui/options/font_settings_handler.h deleted file mode 100644 index dd9196b..0000000 --- a/chrome/browser/dom_ui/options/font_settings_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_FONT_SETTINGS_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_FONT_SETTINGS_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/font_settings_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_FONT_SETTINGS_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/font_settings_utils.h b/chrome/browser/dom_ui/options/font_settings_utils.h deleted file mode 100644 index 012c2a5..0000000 --- a/chrome/browser/dom_ui/options/font_settings_utils.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_FONT_SETTINGS_UTILS_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_FONT_SETTINGS_UTILS_H_ -#pragma once - -#include "chrome/browser/webui/options/font_settings_utils.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_FONT_SETTINGS_UTILS_H_ diff --git a/chrome/browser/dom_ui/options/import_data_handler.h b/chrome/browser/dom_ui/options/import_data_handler.h deleted file mode 100644 index e2e5eee..0000000 --- a/chrome/browser/dom_ui/options/import_data_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_IMPORT_DATA_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_IMPORT_DATA_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/import_data_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_IMPORT_DATA_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/language_options_handler.h b/chrome/browser/dom_ui/options/language_options_handler.h deleted file mode 100644 index e2448eb..0000000 --- a/chrome/browser/dom_ui/options/language_options_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/language_options_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/language_options_handler_common.h b/chrome/browser/dom_ui/options/language_options_handler_common.h deleted file mode 100644 index 05c0ce7..0000000 --- a/chrome/browser/dom_ui/options/language_options_handler_common.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_ -#pragma once - -#include "chrome/browser/webui/options/language_options_handler_common.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_ diff --git a/chrome/browser/dom_ui/options/options_managed_banner_handler.h b/chrome/browser/dom_ui/options/options_managed_banner_handler.h deleted file mode 100644 index c7422ca..0000000 --- a/chrome/browser/dom_ui/options/options_managed_banner_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/options_managed_banner_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/options_ui.h b/chrome/browser/dom_ui/options/options_ui.h deleted file mode 100644 index c1a04eb..0000000 --- a/chrome/browser/dom_ui/options/options_ui.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_OPTIONS_UI_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_OPTIONS_UI_H_ -#pragma once - -#include "chrome/browser/webui/options/options_ui.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_OPTIONS_UI_H_ diff --git a/chrome/browser/dom_ui/options/password_manager_handler.h b/chrome/browser/dom_ui/options/password_manager_handler.h deleted file mode 100644 index 787b853..0000000 --- a/chrome/browser/dom_ui/options/password_manager_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/password_manager_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/personal_options_handler.h b/chrome/browser/dom_ui/options/personal_options_handler.h deleted file mode 100644 index 92e9e29..0000000 --- a/chrome/browser/dom_ui/options/personal_options_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_PERSONAL_OPTIONS_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_PERSONAL_OPTIONS_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/personal_options_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_PERSONAL_OPTIONS_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/search_engine_manager_handler.h b/chrome/browser/dom_ui/options/search_engine_manager_handler.h deleted file mode 100644 index f391f51..0000000 --- a/chrome/browser/dom_ui/options/search_engine_manager_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/search_engine_manager_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_ diff --git a/chrome/browser/dom_ui/options/stop_syncing_handler.h b/chrome/browser/dom_ui/options/stop_syncing_handler.h deleted file mode 100644 index cd69363..0000000 --- a/chrome/browser/dom_ui/options/stop_syncing_handler.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium 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_DOM_UI_OPTIONS_STOP_SYNCING_HANDLER_H_ -#define CHROME_BROWSER_DOM_UI_OPTIONS_STOP_SYNCING_HANDLER_H_ -#pragma once - -#include "chrome/browser/webui/options/stop_syncing_handler.h" -// TODO(tfarina): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_DOM_UI_OPTIONS_STOP_SYNCING_HANDLER_H_ diff --git a/chrome/browser/dom_ui/settings_browsertest.cc b/chrome/browser/dom_ui/settings_browsertest.cc index 9f63ada..789de66 100644 --- a/chrome/browser/dom_ui/settings_browsertest.cc +++ b/chrome/browser/dom_ui/settings_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/dom_ui/web_ui_browsertest.h" -#include "chrome/browser/dom_ui/options/core_options_handler.h" +#include "chrome/browser/webui/options/core_options_handler.h" #include "chrome/common/url_constants.h" #include "chrome/test/ui_test_utils.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index e3df05d..17d54be 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -34,7 +34,6 @@ #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/debugger/devtools_toggle_action.h" #include "chrome/browser/debugger/devtools_window.h" -#include "chrome/browser/dom_ui/options/content_settings_handler.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" @@ -91,6 +90,7 @@ #include "chrome/browser/web_applications/web_app.h" #include "chrome/browser/webui/bug_report_ui.h" #include "chrome/browser/webui/filebrowse_ui.h" +#include "chrome/browser/webui/options/content_settings_handler.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_restriction.h" diff --git a/chrome/browser/webui/options/about_page_handler.cc b/chrome/browser/webui/options/about_page_handler.cc index 703d1f9..0c71d11 100644 --- a/chrome/browser/webui/options/about_page_handler.cc +++ b/chrome/browser/webui/options/about_page_handler.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/dom_ui/options/about_page_handler.h" +#include "chrome/browser/webui/options/about_page_handler.h" #include <vector> diff --git a/chrome/browser/webui/options/about_page_handler.h b/chrome/browser/webui/options/about_page_handler.h index 96ec69c..eb19a36 100644 --- a/chrome/browser/webui/options/about_page_handler.h +++ b/chrome/browser/webui/options/about_page_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/browser/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/cros/update_library.h" diff --git a/chrome/browser/webui/options/add_startup_page_handler.cc b/chrome/browser/webui/options/add_startup_page_handler.cc index 9ecf5d0..ed0491f 100644 --- a/chrome/browser/webui/options/add_startup_page_handler.cc +++ b/chrome/browser/webui/options/add_startup_page_handler.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/dom_ui/options/add_startup_page_handler.h" +#include "chrome/browser/webui/options/add_startup_page_handler.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/webui/options/add_startup_page_handler.h b/chrome/browser/webui/options/add_startup_page_handler.h index 3cc915f..ecce3bf 100644 --- a/chrome/browser/webui/options/add_startup_page_handler.h +++ b/chrome/browser/webui/options/add_startup_page_handler.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "chrome/browser/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" #include "ui/base/models/table_model_observer.h" class PossibleURLModel; diff --git a/chrome/browser/webui/options/advanced_options_handler.cc b/chrome/browser/webui/options/advanced_options_handler.cc index 1d9152c..96aee00 100644 --- a/chrome/browser/webui/options/advanced_options_handler.cc +++ b/chrome/browser/webui/options/advanced_options_handler.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/dom_ui/options/advanced_options_handler.h" +#include "chrome/browser/webui/options/advanced_options_handler.h" #include <string> @@ -11,8 +11,6 @@ #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/dom_ui/options/dom_options_util.h" -#include "chrome/browser/dom_ui/options/options_managed_banner_handler.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/google/google_util.h" @@ -29,6 +27,8 @@ #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/options/options_util.h" #include "chrome/browser/ui/options/options_window.h" +#include "chrome/browser/webui/options/dom_options_util.h" +#include "chrome/browser/webui/options/options_managed_banner_handler.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_type.h" @@ -41,7 +41,7 @@ #if !defined(OS_CHROMEOS) #include "chrome/browser/browser_process.h" -#include "chrome/browser/dom_ui/options/advanced_options_utils.h" +#include "chrome/browser/webui/options/advanced_options_utils.h" #endif #if defined(OS_WIN) diff --git a/chrome/browser/webui/options/advanced_options_handler.h b/chrome/browser/webui/options/advanced_options_handler.h index f02aba5..fccde12 100644 --- a/chrome/browser/webui/options/advanced_options_handler.h +++ b/chrome/browser/webui/options/advanced_options_handler.h @@ -6,12 +6,12 @@ #define CHROME_BROWSER_WEBUI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_set_observer.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" #include "chrome/browser/remoting/remoting_options_handler.h" #include "chrome/browser/ui/shell_dialogs.h" +#include "chrome/browser/webui/options/options_ui.h" class OptionsManagedBannerHandler; diff --git a/chrome/browser/webui/options/advanced_options_utils_gtk.cc b/chrome/browser/webui/options/advanced_options_utils_gtk.cc index 951e1a5..a5efd25 100644 --- a/chrome/browser/webui/options/advanced_options_utils_gtk.cc +++ b/chrome/browser/webui/options/advanced_options_utils_gtk.cc @@ -4,13 +4,13 @@ #if !defined(OS_CHROMEOS) -#include "chrome/browser/dom_ui/options/advanced_options_utils.h" +#include "chrome/browser/webui/options/advanced_options_utils.h" -#include "base/file_util.h" #include "base/environment.h" +#include "base/file_util.h" +#include "base/nix/xdg_util.h" #include "base/process_util.h" #include "base/string_tokenizer.h" -#include "base/nix/xdg_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/webui/options/advanced_options_utils_mac.mm b/chrome/browser/webui/options/advanced_options_utils_mac.mm index e3bd4f7..430a491 100644 --- a/chrome/browser/webui/options/advanced_options_utils_mac.mm +++ b/chrome/browser/webui/options/advanced_options_utils_mac.mm @@ -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. #import <Cocoa/Cocoa.h> -#include "chrome/browser/dom_ui/options/advanced_options_utils.h" +#include "chrome/browser/webui/options/advanced_options_utils.h" #include "base/logging.h" #include "base/mac/scoped_aedesc.h" diff --git a/chrome/browser/webui/options/advanced_options_utils_win.cc b/chrome/browser/webui/options/advanced_options_utils_win.cc index 893cda1..196ce35 100644 --- a/chrome/browser/webui/options/advanced_options_utils_win.cc +++ b/chrome/browser/webui/options/advanced_options_utils_win.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/dom_ui/options/advanced_options_utils.h" +#include "chrome/browser/webui/options/advanced_options_utils.h" #include <windows.h> #include <cryptuiapi.h> diff --git a/chrome/browser/webui/options/autofill_options_handler.cc b/chrome/browser/webui/options/autofill_options_handler.cc index 32810c8..fe3fba8 100644 --- a/chrome/browser/webui/options/autofill_options_handler.cc +++ b/chrome/browser/webui/options/autofill_options_handler.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/dom_ui/options/autofill_options_handler.h" +#include "chrome/browser/webui/options/autofill_options_handler.h" #include <vector> diff --git a/chrome/browser/webui/options/autofill_options_handler.h b/chrome/browser/webui/options/autofill_options_handler.h index e117408..2a69fb0 100644 --- a/chrome/browser/webui/options/autofill_options_handler.h +++ b/chrome/browser/webui/options/autofill_options_handler.h @@ -8,7 +8,7 @@ #include <string> #include "chrome/browser/autofill/personal_data_manager.h" -#include "chrome/browser/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" class DictionaryValue; class ListValue; diff --git a/chrome/browser/webui/options/browser_options_handler.cc b/chrome/browser/webui/options/browser_options_handler.cc index 10aa148..a44e896 100644 --- a/chrome/browser/webui/options/browser_options_handler.cc +++ b/chrome/browser/webui/options/browser_options_handler.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/dom_ui/options/browser_options_handler.h" +#include "chrome/browser/webui/options/browser_options_handler.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" @@ -13,8 +13,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/custom_home_pages_table_model.h" -#include "chrome/browser/dom_ui/options/dom_options_util.h" -#include "chrome/browser/dom_ui/options/options_managed_banner_handler.h" #include "chrome/browser/dom_ui/web_ui_favicon_source.h" #include "chrome/browser/instant/instant_confirm_dialog.h" #include "chrome/browser/metrics/user_metrics.h" @@ -25,6 +23,8 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/ui/options/options_window.h" +#include "chrome/browser/webui/options/dom_options_util.h" +#include "chrome/browser/webui/options/options_managed_banner_handler.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/browser_distribution.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/webui/options/browser_options_handler.h b/chrome/browser/webui/options/browser_options_handler.h index dba6c9a..65453e6 100644 --- a/chrome/browser/webui/options/browser_options_handler.h +++ b/chrome/browser/webui/options/browser_options_handler.h @@ -6,10 +6,10 @@ #define CHROME_BROWSER_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/search_engines/template_url_model_observer.h" #include "chrome/browser/shell_integration.h" +#include "chrome/browser/webui/options/options_ui.h" #include "ui/base/models/table_model_observer.h" class CustomHomePagesTableModel; diff --git a/chrome/browser/webui/options/certificate_manager_handler.cc b/chrome/browser/webui/options/certificate_manager_handler.cc index a0cd4ba..bdbbfc9 100644 --- a/chrome/browser/webui/options/certificate_manager_handler.cc +++ b/chrome/browser/webui/options/certificate_manager_handler.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/dom_ui/options/certificate_manager_handler.h" +#include "chrome/browser/webui/options/certificate_manager_handler.h" #include "base/file_util.h" // for FileAccessProvider #include "base/safe_strerror_posix.h" diff --git a/chrome/browser/webui/options/certificate_manager_handler.h b/chrome/browser/webui/options/certificate_manager_handler.h index 1065599..143ecaa 100644 --- a/chrome/browser/webui/options/certificate_manager_handler.h +++ b/chrome/browser/webui/options/certificate_manager_handler.h @@ -11,8 +11,8 @@ #include "base/scoped_ptr.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/certificate_manager_model.h" -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/ui/shell_dialogs.h" +#include "chrome/browser/webui/options/options_ui.h" #include "net/base/cert_database.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/webui/options/clear_browser_data_handler.cc b/chrome/browser/webui/options/clear_browser_data_handler.cc index 08afd5d..2823c2e 100644 --- a/chrome/browser/webui/options/clear_browser_data_handler.cc +++ b/chrome/browser/webui/options/clear_browser_data_handler.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/dom_ui/options/clear_browser_data_handler.h" +#include "chrome/browser/webui/options/clear_browser_data_handler.h" #include "base/basictypes.h" #include "base/string16.h" diff --git a/chrome/browser/webui/options/clear_browser_data_handler.h b/chrome/browser/webui/options/clear_browser_data_handler.h index 9c1c2ef..dcf6a1b 100644 --- a/chrome/browser/webui/options/clear_browser_data_handler.h +++ b/chrome/browser/webui/options/clear_browser_data_handler.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/plugin_data_remover_helper.h" +#include "chrome/browser/webui/options/options_ui.h" // Clear browser data handler page UI handler. class ClearBrowserDataHandler : public OptionsPageUIHandler, diff --git a/chrome/browser/webui/options/content_settings_handler.cc b/chrome/browser/webui/options/content_settings_handler.cc index 4a7a649..88e7c3a 100644 --- a/chrome/browser/webui/options/content_settings_handler.cc +++ b/chrome/browser/webui/options/content_settings_handler.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/dom_ui/options/content_settings_handler.h" +#include "chrome/browser/webui/options/content_settings_handler.h" #include "base/callback.h" #include "base/command_line.h" diff --git a/chrome/browser/webui/options/content_settings_handler.h b/chrome/browser/webui/options/content_settings_handler.h index 4bc7bcf..0fc4a03 100644 --- a/chrome/browser/webui/options/content_settings_handler.h +++ b/chrome/browser/webui/options/content_settings_handler.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/plugin_data_remover_helper.h" #include "chrome/browser/prefs/pref_change_registrar.h" +#include "chrome/browser/webui/options/options_ui.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/webui/options/cookies_view_handler.cc b/chrome/browser/webui/options/cookies_view_handler.cc index edde6b6..a18d11b 100644 --- a/chrome/browser/webui/options/cookies_view_handler.cc +++ b/chrome/browser/webui/options/cookies_view_handler.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/dom_ui/options/cookies_view_handler.h" +#include "chrome/browser/webui/options/cookies_view_handler.h" #include "base/i18n/time_formatting.h" #include "base/string_number_conversions.h" diff --git a/chrome/browser/webui/options/cookies_view_handler.h b/chrome/browser/webui/options/cookies_view_handler.h index 8aa9f1d..4a3be06 100644 --- a/chrome/browser/webui/options/cookies_view_handler.h +++ b/chrome/browser/webui/options/cookies_view_handler.h @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/cookies_tree_model.h" -#include "chrome/browser/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" class CookiesViewHandler : public OptionsPageUIHandler, public CookiesTreeModel::Observer { diff --git a/chrome/browser/webui/options/core_options_handler.cc b/chrome/browser/webui/options/core_options_handler.cc index 5a20e8b..b1eaae48 100644 --- a/chrome/browser/webui/options/core_options_handler.cc +++ b/chrome/browser/webui/options/core_options_handler.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/dom_ui/options/core_options_handler.h" +#include "chrome/browser/webui/options/core_options_handler.h" #include "base/json/json_reader.h" #include "base/scoped_ptr.h" diff --git a/chrome/browser/webui/options/core_options_handler.h b/chrome/browser/webui/options/core_options_handler.h index c1fc9dd..39b1170 100644 --- a/chrome/browser/webui/options/core_options_handler.h +++ b/chrome/browser/webui/options/core_options_handler.h @@ -10,8 +10,8 @@ #include <string> #include "base/values.h" -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/prefs/pref_change_registrar.h" +#include "chrome/browser/webui/options/options_ui.h" // Core options UI handler. // Handles resource and JS calls common to all options sub-pages. diff --git a/chrome/browser/webui/options/dom_options_util.cc b/chrome/browser/webui/options/dom_options_util.cc index 2eb8ec3..0896c27 100644 --- a/chrome/browser/webui/options/dom_options_util.cc +++ b/chrome/browser/webui/options/dom_options_util.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/dom_ui/options/dom_options_util.h" +#include "chrome/browser/webui/options/dom_options_util.h" #include "base/string_util.h" diff --git a/chrome/browser/webui/options/font_settings_handler.cc b/chrome/browser/webui/options/font_settings_handler.cc index 6942acd..5921203 100644 --- a/chrome/browser/webui/options/font_settings_handler.cc +++ b/chrome/browser/webui/options/font_settings_handler.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/dom_ui/options/font_settings_handler.h" +#include "chrome/browser/webui/options/font_settings_handler.h" #include <string> @@ -11,10 +11,10 @@ #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/character_encoding.h" -#include "chrome/browser/dom_ui/options/dom_options_util.h" -#include "chrome/browser/dom_ui/options/font_settings_utils.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/webui/options/dom_options_util.h" +#include "chrome/browser/webui/options/font_settings_utils.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/webui/options/font_settings_handler.h b/chrome/browser/webui/options/font_settings_handler.h index 646604a..1890498 100644 --- a/chrome/browser/webui/options/font_settings_handler.h +++ b/chrome/browser/webui/options/font_settings_handler.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/webui/options/options_ui.h" // Font settings overlay page UI handler. class FontSettingsHandler : public OptionsPageUIHandler { diff --git a/chrome/browser/webui/options/font_settings_utils_gtk.cc b/chrome/browser/webui/options/font_settings_utils_gtk.cc index fa2459e..4f60f95 100644 --- a/chrome/browser/webui/options/font_settings_utils_gtk.cc +++ b/chrome/browser/webui/options/font_settings_utils_gtk.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/dom_ui/options/font_settings_utils.h" +#include "chrome/browser/webui/options/font_settings_utils.h" #include <set> #include <string> diff --git a/chrome/browser/webui/options/font_settings_utils_mac.mm b/chrome/browser/webui/options/font_settings_utils_mac.mm index bfdff36..acf2427 100644 --- a/chrome/browser/webui/options/font_settings_utils_mac.mm +++ b/chrome/browser/webui/options/font_settings_utils_mac.mm @@ -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/dom_ui/options/font_settings_utils.h" +#include "chrome/browser/webui/options/font_settings_utils.h" #import <Cocoa/Cocoa.h> diff --git a/chrome/browser/webui/options/font_settings_utils_win.cc b/chrome/browser/webui/options/font_settings_utils_win.cc index 9a7c9bb..0b9644f 100644 --- a/chrome/browser/webui/options/font_settings_utils_win.cc +++ b/chrome/browser/webui/options/font_settings_utils_win.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/dom_ui/options/font_settings_utils.h" +#include "chrome/browser/webui/options/font_settings_utils.h" #include <set> #include <string> diff --git a/chrome/browser/webui/options/import_data_handler.cc b/chrome/browser/webui/options/import_data_handler.cc index 3931d09..77c8cf6 100644 --- a/chrome/browser/webui/options/import_data_handler.cc +++ b/chrome/browser/webui/options/import_data_handler.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/dom_ui/options/import_data_handler.h" +#include "chrome/browser/webui/options/import_data_handler.h" #include <string> @@ -15,10 +15,10 @@ #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "base/values.h" +#include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/profiles/profile.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "chrome/browser/importer/importer_data_types.h" #include "ui/base/l10n/l10n_util.h" ImportDataHandler::ImportDataHandler() : importer_host_(NULL) { diff --git a/chrome/browser/webui/options/import_data_handler.h b/chrome/browser/webui/options/import_data_handler.h index f77c135..1abc9ed 100644 --- a/chrome/browser/webui/options/import_data_handler.h +++ b/chrome/browser/webui/options/import_data_handler.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_ #include "base/ref_counted.h" -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/importer/importer.h" +#include "chrome/browser/webui/options/options_ui.h" // Chrome personal stuff import data overlay UI handler. class ImportDataHandler : public OptionsPageUIHandler, diff --git a/chrome/browser/webui/options/language_options_handler.cc b/chrome/browser/webui/options/language_options_handler.cc index f3119d5..746ffff 100644 --- a/chrome/browser/webui/options/language_options_handler.cc +++ b/chrome/browser/webui/options/language_options_handler.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/dom_ui/options/language_options_handler.h" +#include "chrome/browser/webui/options/language_options_handler.h" #include <map> #include <string> diff --git a/chrome/browser/webui/options/language_options_handler.h b/chrome/browser/webui/options/language_options_handler.h index f314ce1..537b83f 100644 --- a/chrome/browser/webui/options/language_options_handler.h +++ b/chrome/browser/webui/options/language_options_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/options/language_options_handler_common.h" +#include "chrome/browser/webui/options/language_options_handler_common.h" // Language options UI page handler for non-Chrome OS platforms. For Chrome OS, // see chromeos::CrosLanguageOptionsHandler. diff --git a/chrome/browser/webui/options/language_options_handler_common.cc b/chrome/browser/webui/options/language_options_handler_common.cc index e2e4403..498816f 100644 --- a/chrome/browser/webui/options/language_options_handler_common.cc +++ b/chrome/browser/webui/options/language_options_handler_common.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/dom_ui/options/language_options_handler_common.h" +#include "chrome/browser/webui/options/language_options_handler_common.h" #include <map> #include <string> diff --git a/chrome/browser/webui/options/language_options_handler_common.h b/chrome/browser/webui/options/language_options_handler_common.h index 2dd2846..15d882f 100644 --- a/chrome/browser/webui/options/language_options_handler_common.h +++ b/chrome/browser/webui/options/language_options_handler_common.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_ #pragma once -#include "chrome/browser/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" class DictionaryValue; class ListValue; diff --git a/chrome/browser/webui/options/language_options_handler_unittest.cc b/chrome/browser/webui/options/language_options_handler_unittest.cc index 3b616c4..3e6f4d7 100644 --- a/chrome/browser/webui/options/language_options_handler_unittest.cc +++ b/chrome/browser/webui/options/language_options_handler_unittest.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/dom_ui/options/language_options_handler.h" +#include "chrome/browser/webui/options/language_options_handler.h" #include <string> diff --git a/chrome/browser/webui/options/options_managed_banner_handler.cc b/chrome/browser/webui/options/options_managed_banner_handler.cc index 81d2ccc..28326aa 100644 --- a/chrome/browser/webui/options/options_managed_banner_handler.cc +++ b/chrome/browser/webui/options/options_managed_banner_handler.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/dom_ui/options/options_managed_banner_handler.h" +#include "chrome/browser/webui/options/options_managed_banner_handler.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/webui/options/options_ui.cc b/chrome/browser/webui/options/options_ui.cc index 06eafff..df29f50 100644 --- a/chrome/browser/webui/options/options_ui.cc +++ b/chrome/browser/webui/options/options_ui.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/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" #include <algorithm> #include <vector> @@ -18,29 +18,29 @@ #include "base/values.h" #include "chrome/browser/browser_about_handler.h" #include "chrome/browser/browser_thread.h" -#include "chrome/browser/dom_ui/options/about_page_handler.h" -#include "chrome/browser/dom_ui/options/add_startup_page_handler.h" -#include "chrome/browser/dom_ui/options/advanced_options_handler.h" -#include "chrome/browser/dom_ui/options/autofill_options_handler.h" -#include "chrome/browser/dom_ui/options/browser_options_handler.h" -#include "chrome/browser/dom_ui/options/clear_browser_data_handler.h" -#include "chrome/browser/dom_ui/options/content_settings_handler.h" -#include "chrome/browser/dom_ui/options/cookies_view_handler.h" -#include "chrome/browser/dom_ui/options/core_options_handler.h" -#include "chrome/browser/dom_ui/options/dom_options_util.h" -#include "chrome/browser/dom_ui/options/font_settings_handler.h" -#include "chrome/browser/dom_ui/options/import_data_handler.h" -#include "chrome/browser/dom_ui/options/language_options_handler.h" -#include "chrome/browser/dom_ui/options/password_manager_handler.h" -#include "chrome/browser/dom_ui/options/personal_options_handler.h" -#include "chrome/browser/dom_ui/options/search_engine_manager_handler.h" -#include "chrome/browser/dom_ui/options/stop_syncing_handler.h" #include "chrome/browser/dom_ui/web_ui_theme_source.h" #include "chrome/browser/metrics/user_metrics.h" -#include "chrome/browser/renderer_host/render_view_host.h" #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/tab_contents/tab_contents_delegate.h" +#include "chrome/browser/webui/options/about_page_handler.h" +#include "chrome/browser/webui/options/add_startup_page_handler.h" +#include "chrome/browser/webui/options/advanced_options_handler.h" +#include "chrome/browser/webui/options/autofill_options_handler.h" +#include "chrome/browser/webui/options/browser_options_handler.h" +#include "chrome/browser/webui/options/clear_browser_data_handler.h" +#include "chrome/browser/webui/options/content_settings_handler.h" +#include "chrome/browser/webui/options/cookies_view_handler.h" +#include "chrome/browser/webui/options/core_options_handler.h" +#include "chrome/browser/webui/options/dom_options_util.h" +#include "chrome/browser/webui/options/font_settings_handler.h" +#include "chrome/browser/webui/options/import_data_handler.h" +#include "chrome/browser/webui/options/language_options_handler.h" +#include "chrome/browser/webui/options/password_manager_handler.h" +#include "chrome/browser/webui/options/personal_options_handler.h" +#include "chrome/browser/webui/options/search_engine_manager_handler.h" +#include "chrome/browser/webui/options/stop_syncing_handler.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/notification_type.h" #include "chrome/common/time_format.h" @@ -69,7 +69,7 @@ #endif #if defined(USE_NSS) -#include "chrome/browser/dom_ui/options/certificate_manager_handler.h" +#include "chrome/browser/webui/options/certificate_manager_handler.h" #endif //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/webui/options/password_manager_handler.cc b/chrome/browser/webui/options/password_manager_handler.cc index f14643f..e3cc3f9 100644 --- a/chrome/browser/webui/options/password_manager_handler.cc +++ b/chrome/browser/webui/options/password_manager_handler.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/dom_ui/options/password_manager_handler.h" +#include "chrome/browser/webui/options/password_manager_handler.h" #include "base/callback.h" #include "base/stl_util-inl.h" diff --git a/chrome/browser/webui/options/password_manager_handler.h b/chrome/browser/webui/options/password_manager_handler.h index 3f528c0..0601aa2 100644 --- a/chrome/browser/webui/options/password_manager_handler.h +++ b/chrome/browser/webui/options/password_manager_handler.h @@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/password_manager/password_store.h" +#include "chrome/browser/webui/options/options_ui.h" class PasswordManagerHandler : public OptionsPageUIHandler { public: diff --git a/chrome/browser/webui/options/personal_options_handler.cc b/chrome/browser/webui/options/personal_options_handler.cc index 64968f2..6ef4615 100644 --- a/chrome/browser/webui/options/personal_options_handler.cc +++ b/chrome/browser/webui/options/personal_options_handler.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/dom_ui/options/personal_options_handler.h" +#include "chrome/browser/webui/options/personal_options_handler.h" #include <string> @@ -14,8 +14,6 @@ #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/dom_ui/options/dom_options_util.h" -#include "chrome/browser/dom_ui/options/options_managed_banner_handler.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/sync/profile_sync_service.h" @@ -24,6 +22,8 @@ #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/options/options_page_base.h" #include "chrome/browser/ui/options/options_window.h" +#include "chrome/browser/webui/options/dom_options_util.h" +#include "chrome/browser/webui/options/options_managed_banner_handler.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/webui/options/personal_options_handler.h b/chrome/browser/webui/options/personal_options_handler.h index 67e2793..0f52311 100644 --- a/chrome/browser/webui/options/personal_options_handler.h +++ b/chrome/browser/webui/options/personal_options_handler.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "chrome/browser/browser_signin.h" -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/sync/profile_sync_service.h" +#include "chrome/browser/webui/options/options_ui.h" class OptionsManagedBannerHandler; diff --git a/chrome/browser/webui/options/search_engine_manager_handler.cc b/chrome/browser/webui/options/search_engine_manager_handler.cc index 607ce46..712f2a8 100644 --- a/chrome/browser/webui/options/search_engine_manager_handler.cc +++ b/chrome/browser/webui/options/search_engine_manager_handler.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/dom_ui/options/search_engine_manager_handler.h" +#include "chrome/browser/webui/options/search_engine_manager_handler.h" #include "base/callback.h" #include "base/string_number_conversions.h" diff --git a/chrome/browser/webui/options/search_engine_manager_handler.h b/chrome/browser/webui/options/search_engine_manager_handler.h index abbf364..b7e9430 100644 --- a/chrome/browser/webui/options/search_engine_manager_handler.h +++ b/chrome/browser/webui/options/search_engine_manager_handler.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_ #define CHROME_BROWSER_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_ -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/search_engines/edit_search_engine_controller.h" +#include "chrome/browser/webui/options/options_ui.h" #include "ui/base/models/table_model_observer.h" class KeywordEditorController; diff --git a/chrome/browser/webui/options/stop_syncing_handler.cc b/chrome/browser/webui/options/stop_syncing_handler.cc index 9c0c579..80e7e25 100644 --- a/chrome/browser/webui/options/stop_syncing_handler.cc +++ b/chrome/browser/webui/options/stop_syncing_handler.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/dom_ui/options/stop_syncing_handler.h" +#include "chrome/browser/webui/options/stop_syncing_handler.h" #include "base/basictypes.h" -#include "base/values.h" #include "base/callback.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" -#include "chrome/browser/sync/profile_sync_service.h" +#include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" +#include "chrome/browser/sync/profile_sync_service.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" StopSyncingHandler::StopSyncingHandler() { diff --git a/chrome/browser/webui/options/stop_syncing_handler.h b/chrome/browser/webui/options/stop_syncing_handler.h index fe8590a4..662d0cd 100644 --- a/chrome/browser/webui/options/stop_syncing_handler.h +++ b/chrome/browser/webui/options/stop_syncing_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_WEBUI_OPTIONS_STOP_SYNCING_HANDLER_H_ #define CHROME_BROWSER_WEBUI_OPTIONS_STOP_SYNCING_HANDLER_H_ -#include "chrome/browser/dom_ui/options/options_ui.h" +#include "chrome/browser/webui/options/options_ui.h" // Chrome personal stuff stop syncing overlay UI handler. class StopSyncingHandler : public OptionsPageUIHandler { diff --git a/chrome/browser/webui/web_ui_factory.cc b/chrome/browser/webui/web_ui_factory.cc index a28f7b6..3a73ad6 100644 --- a/chrome/browser/webui/web_ui_factory.cc +++ b/chrome/browser/webui/web_ui_factory.cc @@ -7,7 +7,6 @@ #include "base/command_line.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/dom_ui/new_tab_ui.h" -#include "chrome/browser/dom_ui/options/options_ui.h" #include "chrome/browser/dom_ui/print_preview_ui.h" #include "chrome/browser/dom_ui/sync_internals_ui.h" #include "chrome/browser/dom_ui/textfields_ui.h" @@ -29,6 +28,7 @@ #include "chrome/browser/webui/history_ui.h" #include "chrome/browser/webui/html_dialog_ui.h" #include "chrome/browser/webui/net_internals_ui.h" +#include "chrome/browser/webui/options/options_ui.h" #include "chrome/browser/webui/plugins_ui.h" #include "chrome/browser/webui/remoting_ui.h" #include "chrome/browser/webui/slideshow_ui.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 58871c6..e5dca30 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -868,29 +868,6 @@ 'browser/dom_ui/ntp_login_handler.h', 'browser/dom_ui/ntp_resource_cache.cc', 'browser/dom_ui/ntp_resource_cache.h', - 'browser/dom_ui/options/about_page_handler.h', - 'browser/dom_ui/options/add_startup_page_handler.h', - 'browser/dom_ui/options/advanced_options_handler.h', - 'browser/dom_ui/options/advanced_options_utils.h', - 'browser/dom_ui/options/autofill_options_handler.h', - 'browser/dom_ui/options/browser_options_handler.h', - 'browser/dom_ui/options/certificate_manager_handler.h', - 'browser/dom_ui/options/clear_browser_data_handler.h', - 'browser/dom_ui/options/content_settings_handler.h', - 'browser/dom_ui/options/cookies_view_handler.h', - 'browser/dom_ui/options/core_options_handler.h', - 'browser/dom_ui/options/dom_options_util.h', - 'browser/dom_ui/options/font_settings_handler.h', - 'browser/dom_ui/options/font_settings_utils.h', - 'browser/dom_ui/options/import_data_handler.h', - 'browser/dom_ui/options/language_options_handler.h', - 'browser/dom_ui/options/language_options_handler_common.h', - 'browser/dom_ui/options/options_managed_banner_handler.h', - 'browser/dom_ui/options/options_ui.h', - 'browser/dom_ui/options/password_manager_handler.h', - 'browser/dom_ui/options/personal_options_handler.h', - 'browser/dom_ui/options/search_engine_manager_handler.h', - 'browser/dom_ui/options/stop_syncing_handler.h', 'browser/dom_ui/print_preview_handler.cc', 'browser/dom_ui/print_preview_handler.h', 'browser/dom_ui/print_preview_ui.cc', |