Lands http://codereview.chromium.org/193032 for Charlie:

First pass at adding ChromeOS settings 
- a mock wifi selector combobox 
- touchpad settings that makes calls to synclient 
- on startup, touchpad settings are initialized to what's stored in
preferences

TEST=none
BUG=none

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

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

2 files changed, 10 insertions, 4 deletions

diff --git a/chrome/browser/chromeos/settings_page_view.cc b/chrome/browser/chromeos/settings_page_view.cc
index bfbb46f..9c19c34 100644
--- a/chrome/browser/chromeos/settings_page_view.cc
+++ b/chrome/browser/chromeos/settings_page_view.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/chromeos/settings_page_view.h"
 
+#include "chrome/browser/chromeos/settings_contents_view.h"
 #include "views/controls/label.h"
 #include "views/fill_layout.h"
 #include "views/widget/widget_gtk.h"
@@ -29,7 +30,7 @@ GtkWidget* SettingsPageView::WrapInGtkWidget() {
 }
 
 void SettingsPageView::InitControlLayout() {
-  // Remove this and add the real views we want. We'll likely need to make this
-  // scrollable as well.
-  AddChildView(new views::Label(L"Implement me"));
+  // We'll likely need to make this scrollable
+  settings_contents_view_ = new SettingsContentsView(profile());
+  AddChildView(settings_contents_view_);
 }
diff --git a/chrome/browser/chromeos/settings_page_view.h b/chrome/browser/chromeos/settings_page_view.h
index b512fea..3d7004d 100644
--- a/chrome/browser/chromeos/settings_page_view.h
+++ b/chrome/browser/chromeos/settings_page_view.h
@@ -5,9 +5,11 @@
 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_PAGE_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_PAGE_VIEW_H_
 
+#include <gtk/gtk.h>
+
 #include "chrome/browser/views/options/options_page_view.h"
 
-#include <gtk/gtk.h>
+class SettingsContentsView;
 
 // Settings page for Chrome OS.
 class SettingsPageView : public OptionsPageView {
@@ -23,6 +25,9 @@ class SettingsPageView : public OptionsPageView {
   virtual void InitControlLayout();
 
  private:
+  // Controls for the Settings page
+  SettingsContentsView* settings_contents_view_;
+
   DISALLOW_COPY_AND_ASSIGN(SettingsPageView);
 };