DOMUI settings: move/rename the language options panel so that it can be used cross-platform.

This is just a move CL, code changes will come in a followup.  Moving the files will make the next code review easier.

BUG=56415
TEST=None

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

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

chrome/browser/chromeos/dom_ui/language_options_handler.cc → chrome/browser/dom_ui/options/language_options_handler.cc

@@ -2,7 +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/dom_ui/language_options_handler.h"
+// TODO(csilv): This is for the move CL.  Changes to make this cross-platform
+// will come in the followup CL.
+#if defined(OS_CHROMEOS)
+
+#include "chrome/browser/dom_ui/options/language_options_handler.h"
 
 #include <map>
 #include <set>
@@ -313,3 +317,6 @@ void LanguageOptionsHandler::SignOutCallback(const ListValue* args) {
 }
 
 }  // namespace chromeos
+
+#endif  // OS_CHROMEOS
+

chrome/browser/chromeos/dom_ui/language_options_handler.h → chrome/browser/dom_ui/options/language_options_handler.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium 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_CHROMEOS_DOM_UI_LANGUAGE_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_DOM_UI_LANGUAGE_OPTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_DOM_UI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_
 #pragma once
 
+// TODO(csilv): This is for the move CL.  Changes to make this cross-platform
+// will come in the followup CL.
+#if defined(OS_CHROMEOS)
+
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/dom_ui/options/options_ui.h"
 
@@ -92,4 +96,7 @@ class LanguageOptionsHandler : public OptionsPageUIHandler {
 
 }  // namespace
 
-#endif  // CHROME_BROWSER_CHROMEOS_DOM_UI_LANGUAGE_OPTIONS_HANDLER_H_
+#endif  // OS_CHROMEOS
+
+#endif  // CHROME_BROWSER_DOM_UI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_
+

chrome/browser/chromeos/dom_ui/language_options_handler_unittest.cc → chrome/browser/dom_ui/options/language_options_handler_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium 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/chromeos/dom_ui/language_options_handler.h"
+// TODO(csilv): This is for the move CL.  Changes to make this cross-platform
+// will come in the followup CL.
+#if defined(OS_CHROMEOS)
+
+#include "chrome/browser/dom_ui/options/language_options_handler.h"
 
 #include <string>
 
@@ -171,3 +175,6 @@ TEST(LanguageOptionsHandlerTest, GetSpellCheckLanguageCodeSet) {
 }
 
 }  // namespace chromeos
+
+#endif  // OS_CHROMEOS
+

chrome/browser/dom_ui/options/options_ui.cc

@@ -31,6 +31,7 @@
 #include "chrome/browser/dom_ui/options/core_options_handler.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"
@@ -61,7 +62,6 @@
 #include "chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.h"
 #include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h"
 #include "chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h"
-#include "chrome/browser/chromeos/dom_ui/language_options_handler.h"
 #include "chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.h"
 #include "chrome/browser/chromeos/dom_ui/proxy_handler.h"
 #include "chrome/browser/chromeos/dom_ui/stats_options_handler.h"

chrome/browser/resources/options/options.html

@@ -23,10 +23,11 @@
 <link rel="stylesheet" href="content_settings.css">
 <link rel="stylesheet" href="cookies_view.css">
 <link rel="stylesheet" href="font_settings.css">
+<link rel="stylesheet" href="import_data_overlay.css">
+<link rel="stylesheet" href="language_options.css">
 <link rel="stylesheet" href="password_manager.css">
 <link rel="stylesheet" href="password_manager_list.css">
 <link rel="stylesheet" href="personal_options.css">
-<link rel="stylesheet" href="import_data_overlay.css">
 <link rel="stylesheet" href="search_engine_manager.css">
 <link rel="stylesheet" href="search_page.css">
 <link rel="stylesheet" href="subpages_tab_controls.css">
@@ -34,7 +35,6 @@
   <link rel="stylesheet" href="about_page.css">
   <link rel="stylesheet" href="chromeos_accounts_options_page.css">
   <link rel="stylesheet" href="chromeos_internet_options_page.css">
-  <link rel="stylesheet" href="chromeos_language_options.css">
   <link rel="stylesheet" href="chromeos_proxy.css">
 </if>
 
@@ -68,9 +68,6 @@
   <script src="chromeos_cellular_plan_element.js"></script>
   <script src="chromeos_internet_network_element.js"></script>
   <script src="chromeos_internet_options.js"></script>
-  <script src="chromeos_language_add_language_overlay.js"></script>
-  <script src="chromeos_language_list.js"></script>
-  <script src="chromeos_language_options.js"></script>
   <script src="chromeos_system_options.js"></script>
   <script src="chromeos_accounts_options.js"></script>
   <script src="chromeos_proxy_options.js"></script>
@@ -82,7 +79,6 @@
     var AccountsOptions = options.AccountsOptions;
     var InternetOptions = options.InternetOptions;
     var LanguageHangulOptions = options.LanguageHangulOptions;
-    var LanguageOptions = options.LanguageOptions;
     var SystemOptions = options.SystemOptions;
   </script>
 </if>
@@ -121,6 +117,9 @@
 <script src="font_settings_ui.js"></script>
 <script src="import_data_overlay.js"></script>
 <script src="instant_confirm_overlay.js"></script>
+<script src="language_add_language_overlay.js"></script>
+<script src="language_list.js"></script>
+<script src="language_options.js"></script>
 <script src="password_manager.js"></script>
 <script src="password_manager_list.js"></script>
 <script src="personal_options.js"></script>
@@ -142,8 +141,8 @@
   <include src="clear_browser_data_overlay.html">
   <include src="import_data_overlay.html">
   <include src="instant_confirm_overlay.html">
+  <include src="language_add_language_overlay.html">
   <if expr="pp_ifdef('chromeos')">
-     <include src="chromeos_language_add_language_overlay.html">
      <include
          src="chromeos_language_customize_modifier_keys_overlay.html">
      <include src="chromeos_internet_detail.html">
@@ -187,7 +186,6 @@
            <button class="close-subpage"></button>
            <if expr="pp_ifdef('chromeos')">
              <include src="about_page.html">
-             <include src="chromeos_language_options.html">
              <include src="chromeos_language_chewing_options.html">
              <include src="chromeos_language_hangul_options.html">
              <include src="chromeos_language_mozc_options.html">
@@ -200,6 +198,7 @@
            <include src="autofill_options.html">
            <include src="content_settings.html">
            <include src="font_settings.html">
+           <include src="language_options.html">
            <include src="password_manager.html">
            <include src="search_engine_manager.html">
            <include src="startup_page_manager.html">

chrome/browser/resources/options/options.js

@@ -17,6 +17,7 @@ var CookiesView = options.CookiesView;
 var FontSettings = options.FontSettings;
 var ImportDataOverlay = options.ImportDataOverlay;
 var InstantConfirmOverlay = options.InstantConfirmOverlay;
+var LanguageOptions = options.LanguageOptions;
 var OptionsPage = options.OptionsPage;
 var PasswordManager = options.PasswordManager;
 var PersonalOptions = options.PersonalOptions;

chrome/chrome_browser.gypi

@@ -469,8 +469,6 @@
         'browser/chromeos/dom_ui/language_hangul_options_handler.h',
         'browser/chromeos/dom_ui/language_mozc_options_handler.cc',
         'browser/chromeos/dom_ui/language_mozc_options_handler.h',
-        'browser/chromeos/dom_ui/language_options_handler.cc',
-        'browser/chromeos/dom_ui/language_options_handler.h',
         'browser/chromeos/dom_ui/language_options_util.cc',
         'browser/chromeos/dom_ui/language_options_util.h',
         'browser/chromeos/dom_ui/language_pinyin_options_handler.cc',
@@ -956,6 +954,8 @@
         'browser/dom_ui/options/font_settings_utils_win.cc',
         'browser/dom_ui/options/import_data_handler.cc',
         'browser/dom_ui/options/import_data_handler.h',
+        'browser/dom_ui/options/language_options_handler.cc',
+        'browser/dom_ui/options/language_options_handler.h',
         'browser/dom_ui/options/options_managed_banner_handler.cc',
         'browser/dom_ui/options/options_managed_banner_handler.h',
         'browser/dom_ui/options/options_ui.cc',

chrome/chrome_tests.gypi

@@ -1090,7 +1090,6 @@
         'browser/chrome_browser_application_mac_unittest.mm',
         'browser/chrome_plugin_unittest.cc',
         'browser/chromeos/customization_document_unittest.cc',
-        'browser/chromeos/dom_ui/language_options_handler_unittest.cc',
         'browser/chromeos/dom_ui/login/authenticator_facade_cros_unittest.cc',
         'browser/chromeos/dom_ui/login/authenticator_facade_stub_unittest.cc',
         'browser/chromeos/dom_ui/login/login_ui_unittest.cc',
@@ -1150,6 +1149,7 @@
         'browser/dom_ui/dom_ui_theme_source_unittest.cc',
         'browser/dom_ui/dom_ui_unittest.cc',
         'browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc',
+        'browser/dom_ui/options/language_options_handler_unittest.cc',
         'browser/dom_ui/shown_sections_handler_unittest.cc',
         'browser/download/base_file_unittest.cc',
         'browser/download/download_manager_unittest.cc',