WebUI: Move chromeos/webui remaining files to ui/webui/options/chromeos directory.

BUG=76120
TEST=None

R=estade@chromium.org

Review URL: http://codereview.chromium.org/6711083

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79604 0039d316-1c4b-4281-b951-d872f2087c98

36 files changed, 122 insertions, 121 deletions

diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
index 51463ce..7cc5504 100644
--- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
@@ -7,10 +7,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/webui/core_chromeos_options_handler.h"
-#include "chrome/browser/chromeos/webui/proxy_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/chromeos/webui/accounts_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc
index 574d028..1979728 100644
--- a/chrome/browser/chromeos/webui/accounts_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/accounts_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/chromeos/webui/accounts_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/chromeos/webui/accounts_options_handler.h b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h
index 9146a83..c68bf5a 100644
--- a/chrome/browser/chromeos/webui/accounts_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_ACCOUNTS_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_ACCOUNTS_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_ACCOUNTS_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_ACCOUNTS_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/chromeos/webui/cros_options_page_ui_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h"
 
 class OptionsManagedBannerHandler;
 
@@ -47,4 +47,4 @@ class AccountsOptionsHandler : public CrosOptionsPageUIHandler {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_ACCOUNTS_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_ACCOUNTS_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/chromeos/webui/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
index 25d2c27..ba4bd8d 100644
--- a/chrome/browser/chromeos/webui/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_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/chromeos/webui/core_chromeos_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h"
 
 #include <string>
 
diff --git a/chrome/browser/chromeos/webui/core_chromeos_options_handler.h b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h
index a87b219..3f37bb3 100644
--- a/chrome/browser/chromeos/webui/core_chromeos_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_CORE_CHROMEOS_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_CORE_CHROMEOS_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/ui/webui/options/core_options_handler.h"
@@ -40,4 +40,4 @@ class CoreChromeOSOptionsHandler : public CoreOptionsHandler {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_CORE_CHROMEOS_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/chromeos/webui/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
index 8ccb0dd..fd3bd98 100644
--- a/chrome/browser/chromeos/webui/cros_language_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/cros_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/chromeos/webui/cros_language_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h"
 
 #include <map>
 #include <set>
diff --git a/chrome/browser/chromeos/webui/cros_language_options_handler.h b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h
index d5cf885..c8635f6 100644
--- a/chrome/browser/chromeos/webui/cros_language_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_CROS_LANGUAGE_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_CROS_LANGUAGE_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
@@ -68,4 +68,4 @@ class CrosLanguageOptionsHandler : public LanguageOptionsHandlerCommon {
 
 } // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_CROS_LANGUAGE_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_LANGUAGE_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/chromeos/webui/cros_options_page_ui_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_handler.cc
index 348669be..a8bb19c 100644
--- a/chrome/browser/chromeos/webui/cros_options_page_ui_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_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/chromeos/webui/cros_options_page_ui_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h"
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros_settings.h"
diff --git a/chrome/browser/chromeos/webui/cros_options_page_ui_handler.h b/chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h
index 92c0982..9e3c0e55 100644
--- a/chrome/browser/chromeos/webui/cros_options_page_ui_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_CROS_OPTIONS_PAGE_UI_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_CROS_OPTIONS_PAGE_UI_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_OPTIONS_PAGE_UI_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_OPTIONS_PAGE_UI_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/chromeos/cros_settings_provider.h"
@@ -26,4 +26,4 @@ class CrosOptionsPageUIHandler : public OptionsPageUIHandler {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_CROS_OPTIONS_PAGE_UI_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CROS_OPTIONS_PAGE_UI_HANDLER_H_
diff --git a/chrome/browser/chromeos/webui/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index 3318bcf..6bd7948 100644
--- a/chrome/browser/chromeos/webui/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_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/chromeos/webui/internet_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
diff --git a/chrome/browser/chromeos/webui/internet_options_handler.h b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
index 346419b..5662e28 100644
--- a/chrome/browser/chromeos/webui/internet_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_INTERNET_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_INTERNET_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
 
 #include <string>
 
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/webui/cros_options_page_ui_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h"
 
 class SkBitmap;
 namespace views {
@@ -130,4 +130,4 @@ class InternetOptionsHandler
   DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_INTERNET_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/chromeos/webui/language_chewing_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.cc
index 58333be..a133235 100644
--- a/chrome/browser/chromeos/webui/language_chewing_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_chewing_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/chromeos/webui/language_chewing_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.h"
 
 #include <limits>
 
@@ -11,7 +11,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/chromeos/webui/language_options_util.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_options_util.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/chrome/browser/chromeos/webui/language_chewing_options_handler.h b/chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.h
index c243d67..d8d882b 100644
--- a/chrome/browser/chromeos/webui/language_chewing_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_CHEWING_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_CHEWING_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_CHEWING_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_CHEWING_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/ui/webui/options/options_ui.h"
@@ -27,4 +27,4 @@ class LanguageChewingOptionsHandler : public OptionsPageUIHandler {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_CHEWING_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_CHEWING_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_customize_modifier_keys_handler.cc
index 02ad3c1..b74898e 100644
--- a/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_customize_modifier_keys_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/chromeos/webui/language_customize_modifier_keys_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_customize_modifier_keys_handler.h"
 
 #include "base/values.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h b/chrome/browser/ui/webui/options/chromeos/language_customize_modifier_keys_handler.h
index 643afb1..fa038a3 100644
--- a/chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/language_customize_modifier_keys_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER_H_  // NOLINT
-#define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER_H_  // NOLINT
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER_H_  // NOLINT
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER_H_  // NOLINT
 #pragma once
 
 #include "chrome/browser/prefs/pref_member.h"
@@ -26,4 +26,4 @@ class LanguageCustomizeModifierKeysHandler : public OptionsPageUIHandler {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER_H_  // NOLINT
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_CUSTOMIZE_MODIFIER_KEYS_HANDLER_H_  // NOLINT
diff --git a/chrome/browser/chromeos/webui/language_hangul_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.cc
index 7b4aeb0..800e6512 100644
--- a/chrome/browser/chromeos/webui/language_hangul_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_hangul_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/chromeos/webui/language_hangul_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
diff --git a/chrome/browser/chromeos/webui/language_hangul_options_handler.h b/chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.h
index 3fe469f..ec0770c 100644
--- a/chrome/browser/chromeos/webui/language_hangul_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_HANGUL_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_HANGUL_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_HANGUL_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_HANGUL_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/ui/webui/options/options_ui.h"
@@ -31,4 +31,4 @@ class LanguageHangulOptionsHandler : public OptionsPageUIHandler {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_HANGUL_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_HANGUL_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/chromeos/webui/language_mozc_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.cc
index f80a19a..c9115753 100644
--- a/chrome/browser/chromeos/webui/language_mozc_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/webui/language_mozc_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/chromeos/webui/language_options_util.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_options_util.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/chrome/browser/chromeos/webui/language_mozc_options_handler.h b/chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.h
index 4db0b39..11e6b13 100644
--- a/chrome/browser/chromeos/webui/language_mozc_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_MOZC_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_MOZC_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_MOZC_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_MOZC_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/ui/webui/options/options_ui.h"
@@ -27,4 +27,4 @@ class LanguageMozcOptionsHandler : public OptionsPageUIHandler {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_MOZC_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_MOZC_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/chromeos/webui/language_options_util.cc b/chrome/browser/ui/webui/options/chromeos/language_options_util.cc
index 2f85a4e..cf8a507 100644
--- a/chrome/browser/chromeos/webui/language_options_util.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_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/chromeos/webui/language_options_util.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_options_util.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/webui/language_options_util.h b/chrome/browser/ui/webui/options/chromeos/language_options_util.h
index c4f69a3..49e10da 100644
--- a/chrome/browser/chromeos/webui/language_options_util.h
+++ b/chrome/browser/ui/webui/options/chromeos/language_options_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_OPTIONS_UTIL_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_OPTIONS_UTIL_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_OPTIONS_UTIL_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_OPTIONS_UTIL_H_
 #pragma once
 
 #include <string>
@@ -78,4 +78,4 @@ ListValue* CreateMultipleChoiceList(
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_OPTIONS_UTIL_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_OPTIONS_UTIL_H_
diff --git a/chrome/browser/chromeos/webui/language_pinyin_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.cc
index 7099406..1541000 100644
--- a/chrome/browser/chromeos/webui/language_pinyin_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/webui/language_pinyin_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.h"
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/chromeos/webui/language_options_util.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_options_util.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/chrome/browser/chromeos/webui/language_pinyin_options_handler.h b/chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.h
index 9a5c378..58a7b6a 100644
--- a/chrome/browser/chromeos/webui/language_pinyin_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_PINYIN_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_PINYIN_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_PINYIN_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_PINYIN_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/ui/webui/options/options_ui.h"
@@ -27,4 +27,4 @@ class LanguagePinyinOptionsHandler : public OptionsPageUIHandler {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_LANGUAGE_PINYIN_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_LANGUAGE_PINYIN_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/chromeos/webui/proxy_handler.cc b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc
index 6659fe7..e4e67e2 100644
--- a/chrome/browser/chromeos/webui/proxy_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/proxy_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/chromeos/webui/proxy_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
diff --git a/chrome/browser/chromeos/webui/proxy_handler.h b/chrome/browser/ui/webui/options/chromeos/proxy_handler.h
index d531557..692d2fe 100644
--- a/chrome/browser/chromeos/webui/proxy_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/proxy_handler.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_PROXY_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_PROXY_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_PROXY_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_PROXY_HANDLER_H_
 
-#include "chrome/browser/chromeos/webui/cros_options_page_ui_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h"
 namespace chromeos {
 
 // ChromeOS proxy options page UI handler.
@@ -22,4 +22,4 @@ class ProxyHandler : public CrosOptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(ProxyHandler);
 };
 } // namespace chromeos
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_PROXY_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_PROXY_HANDLER_H_
diff --git a/chrome/browser/chromeos/webui/stats_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/stats_options_handler.cc
index 8dcb093..84ee134 100644
--- a/chrome/browser/chromeos/webui/stats_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/stats_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/chromeos/webui/stats_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
diff --git a/chrome/browser/chromeos/webui/stats_options_handler.h b/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h
index 36b8bf0..af2963d 100644
--- a/chrome/browser/chromeos/webui/stats_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_STATS_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_STATS_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_STATS_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_STATS_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/chromeos/webui/cros_options_page_ui_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h"
 
 namespace chromeos {
 
@@ -37,4 +37,4 @@ class StatsOptionsHandler : public CrosOptionsPageUIHandler {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_STATS_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_STATS_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/chromeos/webui/system_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc
index 027504a..921e138 100644
--- a/chrome/browser/chromeos/webui/system_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/system_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/chromeos/webui/system_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/system_options_handler.h"
 
 #include <string>
 
@@ -13,8 +13,8 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/chromeos/webui/system_settings_provider.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/ui/webui/options/chromeos/system_settings_provider.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/webui/system_options_handler.h b/chrome/browser/ui/webui/options/chromeos/system_options_handler.h
index fa36532..463e56b 100644
--- a/chrome/browser/chromeos/webui/system_options_handler.h
+++ b/chrome/browser/ui/webui/options/chromeos/system_options_handler.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_SYSTEM_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_SYSTEM_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_SYSTEM_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_SYSTEM_OPTIONS_HANDLER_H_
 #pragma once
 
-#include "chrome/browser/chromeos/webui/cros_options_page_ui_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h"
 
 class DictionaryValue;
 
@@ -31,4 +31,4 @@ class SystemOptionsHandler : public chromeos::CrosOptionsPageUIHandler {
   DISALLOW_COPY_AND_ASSIGN(SystemOptionsHandler);
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_SYSTEM_OPTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_SYSTEM_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/chromeos/webui/system_settings_provider.cc b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc
index c29cca2..42ef083 100644
--- a/chrome/browser/chromeos/webui/system_settings_provider.cc
+++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.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/chromeos/webui/system_settings_provider.h"
+#include "chrome/browser/ui/webui/options/chromeos/system_settings_provider.h"
 
 #include <string>
 
diff --git a/chrome/browser/chromeos/webui/system_settings_provider.h b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h
index 72dba46..aaed7bc 100644
--- a/chrome/browser/chromeos/webui/system_settings_provider.h
+++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_SYSTEM_SETTINGS_PROVIDER_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_SYSTEM_SETTINGS_PROVIDER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_SYSTEM_SETTINGS_PROVIDER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_SYSTEM_SETTINGS_PROVIDER_H_
 
 #include <vector>
 
@@ -63,4 +63,4 @@ class SystemSettingsProvider : public CrosSettingsProvider,
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_SYSTEM_SETTINGS_PROVIDER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_SYSTEM_SETTINGS_PROVIDER_H_
diff --git a/chrome/browser/chromeos/webui/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
index 3a4b0aa..2ba294e 100644
--- a/chrome/browser/chromeos/webui/user_image_source.cc
+++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.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/chromeos/webui/user_image_source.h"
+#include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
diff --git a/chrome/browser/chromeos/webui/user_image_source.h b/chrome/browser/ui/webui/options/chromeos/user_image_source.h
index d68a4c8..a9e67d0 100644
--- a/chrome/browser/chromeos/webui/user_image_source.h
+++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEBUI_USER_IMAGE_SOURCE_H_
-#define CHROME_BROWSER_CHROMEOS_WEBUI_USER_IMAGE_SOURCE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_USER_IMAGE_SOURCE_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_USER_IMAGE_SOURCE_H_
 #pragma once
 
 #include <string>
@@ -40,4 +40,4 @@ class UserImageSource : public ChromeURLDataManager::DataSource {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEBUI_USER_IMAGE_SOURCE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_USER_IMAGE_SOURCE_H_
diff --git a/chrome/browser/ui/webui/options/language_options_handler_unittest.cc b/chrome/browser/ui/webui/options/language_options_handler_unittest.cc
index 7f744f2..18554e4 100644
--- a/chrome/browser/ui/webui/options/language_options_handler_unittest.cc
+++ b/chrome/browser/ui/webui/options/language_options_handler_unittest.cc
@@ -13,7 +13,7 @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/input_method_library.h"
-#include "chrome/browser/chromeos/webui/cros_language_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h"
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index 2601f34..a823940 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -52,19 +52,19 @@
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/webui/accounts_options_handler.h"
-#include "chrome/browser/chromeos/webui/core_chromeos_options_handler.h"
-#include "chrome/browser/chromeos/webui/cros_language_options_handler.h"
-#include "chrome/browser/chromeos/webui/internet_options_handler.h"
-#include "chrome/browser/chromeos/webui/language_chewing_options_handler.h"
-#include "chrome/browser/chromeos/webui/language_customize_modifier_keys_handler.h"
-#include "chrome/browser/chromeos/webui/language_hangul_options_handler.h"
-#include "chrome/browser/chromeos/webui/language_mozc_options_handler.h"
-#include "chrome/browser/chromeos/webui/language_pinyin_options_handler.h"
-#include "chrome/browser/chromeos/webui/proxy_handler.h"
-#include "chrome/browser/chromeos/webui/stats_options_handler.h"
-#include "chrome/browser/chromeos/webui/system_options_handler.h"
-#include "chrome/browser/chromeos/webui/user_image_source.h"
+#include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_chewing_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_customize_modifier_keys_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_hangul_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_mozc_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/language_pinyin_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/system_options_handler.h"
+#include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
 #endif
 
 #if defined(USE_NSS)
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index d5b3940..31cfa03 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -681,38 +681,6 @@
         'browser/chromeos/views/dropdown_button.h',
         'browser/chromeos/volume_bubble.cc',
         'browser/chromeos/volume_bubble.h',
-        'browser/chromeos/webui/accounts_options_handler.cc',
-        'browser/chromeos/webui/accounts_options_handler.h',
-        'browser/chromeos/webui/core_chromeos_options_handler.cc',
-        'browser/chromeos/webui/core_chromeos_options_handler.h',
-        'browser/chromeos/webui/cros_language_options_handler.cc',
-        'browser/chromeos/webui/cros_language_options_handler.h',
-        'browser/chromeos/webui/cros_options_page_ui_handler.cc',
-        'browser/chromeos/webui/cros_options_page_ui_handler.h',
-        'browser/chromeos/webui/internet_options_handler.cc',
-        'browser/chromeos/webui/internet_options_handler.h',
-        'browser/chromeos/webui/language_chewing_options_handler.cc',
-        'browser/chromeos/webui/language_chewing_options_handler.h',
-        'browser/chromeos/webui/language_customize_modifier_keys_handler.cc',
-        'browser/chromeos/webui/language_customize_modifier_keys_handler.h',
-        'browser/chromeos/webui/language_hangul_options_handler.cc',
-        'browser/chromeos/webui/language_hangul_options_handler.h',
-        'browser/chromeos/webui/language_mozc_options_handler.cc',
-        'browser/chromeos/webui/language_mozc_options_handler.h',
-        'browser/chromeos/webui/language_options_util.cc',
-        'browser/chromeos/webui/language_options_util.h',
-        'browser/chromeos/webui/language_pinyin_options_handler.cc',
-        'browser/chromeos/webui/language_pinyin_options_handler.h',
-        'browser/chromeos/webui/proxy_handler.cc',
-        'browser/chromeos/webui/proxy_handler.h',
-        'browser/chromeos/webui/stats_options_handler.cc',
-        'browser/chromeos/webui/stats_options_handler.h',
-        'browser/chromeos/webui/system_options_handler.cc',
-        'browser/chromeos/webui/system_options_handler.h',
-        'browser/chromeos/webui/system_settings_provider.cc',
-        'browser/chromeos/webui/system_settings_provider.h',
-        'browser/chromeos/webui/user_image_source.cc',
-        'browser/chromeos/webui/user_image_source.h',
         'browser/chromeos/wm_ipc.cc',
         'browser/chromeos/wm_ipc.h',
         'browser/chromeos/wm_message_listener.cc',
@@ -3188,6 +3156,38 @@
         'browser/ui/webui/options/browser_options_handler.h',
         'browser/ui/webui/options/certificate_manager_handler.cc',
         'browser/ui/webui/options/certificate_manager_handler.h',
+        'browser/ui/webui/options/chromeos/accounts_options_handler.cc',
+        'browser/ui/webui/options/chromeos/accounts_options_handler.h',
+        'browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc',
+        'browser/ui/webui/options/chromeos/core_chromeos_options_handler.h',
+        'browser/ui/webui/options/chromeos/cros_language_options_handler.cc',
+        'browser/ui/webui/options/chromeos/cros_language_options_handler.h',
+        'browser/ui/webui/options/chromeos/cros_options_page_ui_handler.cc',
+        'browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h',
+        'browser/ui/webui/options/chromeos/internet_options_handler.cc',
+        'browser/ui/webui/options/chromeos/internet_options_handler.h',
+        'browser/ui/webui/options/chromeos/language_chewing_options_handler.cc',
+        'browser/ui/webui/options/chromeos/language_chewing_options_handler.h',
+        'browser/ui/webui/options/chromeos/language_customize_modifier_keys_handler.cc',
+        'browser/ui/webui/options/chromeos/language_customize_modifier_keys_handler.h',
+        'browser/ui/webui/options/chromeos/language_hangul_options_handler.cc',
+        'browser/ui/webui/options/chromeos/language_hangul_options_handler.h',
+        'browser/ui/webui/options/chromeos/language_mozc_options_handler.cc',
+        'browser/ui/webui/options/chromeos/language_mozc_options_handler.h',
+        'browser/ui/webui/options/chromeos/language_options_util.cc',
+        'browser/ui/webui/options/chromeos/language_options_util.h',
+        'browser/ui/webui/options/chromeos/language_pinyin_options_handler.cc',
+        'browser/ui/webui/options/chromeos/language_pinyin_options_handler.h',
+        'browser/ui/webui/options/chromeos/proxy_handler.cc',
+        'browser/ui/webui/options/chromeos/proxy_handler.h',
+        'browser/ui/webui/options/chromeos/stats_options_handler.cc',
+        'browser/ui/webui/options/chromeos/stats_options_handler.h',
+        'browser/ui/webui/options/chromeos/system_options_handler.cc',
+        'browser/ui/webui/options/chromeos/system_options_handler.h',
+        'browser/ui/webui/options/chromeos/system_settings_provider.cc',
+        'browser/ui/webui/options/chromeos/system_settings_provider.h',
+        'browser/ui/webui/options/chromeos/user_image_source.cc',
+        'browser/ui/webui/options/chromeos/user_image_source.h',
         'browser/ui/webui/options/clear_browser_data_handler.cc',
         'browser/ui/webui/options/clear_browser_data_handler.h',
         'browser/ui/webui/options/content_settings_handler.cc',
@@ -3311,6 +3311,7 @@
           'sources/': [
             ['exclude', '^browser/chromeos'],
             ['exclude', '^browser/ui/webui/chromeos'],
+            ['exclude', '^browser/ui/webui/options/chromeos'],
             ['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
             ['exclude', 'browser/oom_priority_manager.cc'],
             ['exclude', 'browser/oom_priority_manager.h'],