dom-ui settings: enable languages & spell checker settings for all platforms....

chrome/browser/dom_ui/options/language_options_handler.h

Index: chrome/browser/dom_ui/options/language_options_handler.h
===================================================================
--- chrome/browser/dom_ui/options/language_options_handler.h	(revision 71884)
+++ chrome/browser/dom_ui/options/language_options_handler.h	(working copy)
@@ -6,18 +6,15 @@
 #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.
+#include "chrome/browser/dom_ui/options/options_ui.h"
+
 #if defined(OS_CHROMEOS)
-
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
-#include "chrome/browser/dom_ui/options/options_ui.h"
+#endif

[James Hawkins, 2011/01/20 03:11:08]

#endif  // defined(OS_CHROMEOS)

here and everywhere else.

[csilv, 2011/01/20 20:09:55]

Done.

 
 class DictionaryValue;
 class ListValue;
 
-namespace chromeos {
-
 // ChromeOS language options page UI handler.

[James Hawkins, 2011/01/20 03:11:08]

s/ChromeOS l/L/

[csilv, 2011/01/20 20:09:55]

Done.

 class LanguageOptionsHandler : public OptionsPageUIHandler {
  public:
@@ -39,14 +36,21 @@
   //
   // Note that true in languageCodeSet does not mean anything. We just use
   // the dictionary as a set.
+#if defined(OS_CHROMEOS)

[James Hawkins, 2011/01/20 03:11:08]

I'm not going to make you change it now, but the number of ifdefs in this file
makes me think a refactoring is needed at some point.

[satorux1, 2011/01/20 10:40:33]

I agree. Let's do it in a separate patch. One way to refactor this would be to
make the chrome os version to be a sub class. In retrospect, I should've written
this for all platforms from the beginning. 

[csilv, 2011/01/20 20:09:55]

Agree to both of you.  I think a ChromeOS specific subclass makes perfect sense.
 Using conditionals is the more "low-impact" approach that I want to take right
now, but this will be high priority after all the M10 requirements are met.

[satorux1, 2011/01/21 01:38:46]

We can take care of the refactoring from Tokyo, as we are more familiar with the
chrome os specific stuff. what do you think?

   static ListValue* GetInputMethodList(
-      const InputMethodDescriptors& descriptors);
+      const chromeos::InputMethodDescriptors& descriptors);
+#endif
 
   // Gets the list of languages from the given input descriptors.
   // The return value will look like:
   // [{'code': 'fi', 'displayName': 'Finnish', 'nativeDisplayName': 'suomi'},
   //  ...]
-  static ListValue* GetLanguageList(const InputMethodDescriptors& descriptors);
+#if defined(OS_CHROMEOS)
+  static ListValue* GetLanguageList(
+      const chromeos::InputMethodDescriptors& descriptors);
+#else
+  static ListValue* GetLanguageList();
+#endif
 
   // Gets the set of language codes that can be used as UI language.
   // The return value will look like:
@@ -65,6 +69,7 @@
   static DictionaryValue* GetSpellCheckLanguageCodeSet();
 
  private:
+#if defined(OS_CHROMEOS)
   // Called when the input method is disabled.
   // |args| will contain the input method ID as string (ex. "mozc").
   void InputMethodDisableCallback(const ListValue* args);
@@ -76,6 +81,7 @@
   // Called when the input method options page is opened.
   // |args| will contain the input method ID as string (ex. "mozc").
   void InputMethodOptionsOpenCallback(const ListValue* args);
+#endif
 
   // Called when the language options is opened.
   void LanguageOptionsOpenCallback(const ListValue* args);
@@ -88,15 +94,10 @@
   // |args| will contain the language code as string (ex. "fr").
   void SpellCheckLanguageChangeCallback(const ListValue* args);
 
-  // Called when the sign out button is clicked.
-  void SignOutCallback(const ListValue* args);
+  // Called when the restart/sign-out button is clicked.
+  void RestartCallback(const ListValue* args);
 
   DISALLOW_COPY_AND_ASSIGN(LanguageOptionsHandler);
 };
 
-}  // namespace
-
-#endif  // OS_CHROMEOS
-
 #endif  // CHROME_BROWSER_DOM_UI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_
-