Options2: Pull the trigger.

chrome/browser/ui/webui/options2/options_ui2.h

Index: chrome/browser/ui/webui/options2/options_ui2.h
diff --git a/chrome/browser/ui/webui/options/options_ui.h b/chrome/browser/ui/webui/options2/options_ui2.h
similarity index 77%
copy from chrome/browser/ui/webui/options/options_ui.h
copy to chrome/browser/ui/webui/options2/options_ui2.h
index 184af3617237897aa8c86c79224f172c757d7f29..9a7a75983609d652430f2accb996182d2a543ad9 100644
--- a/chrome/browser/ui/webui/options/options_ui.h
+++ b/chrome/browser/ui/webui/options2/options_ui2.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_UI_WEBUI_OPTIONS_OPTIONS_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_H_
 #pragma once
 
 #include <string>
@@ -17,11 +17,11 @@
 #include "content/public/browser/notification_types.h"
 
 // The base class handler of Javascript messages of options pages.
-class OptionsPageUIHandler : public WebUIMessageHandler,
-                             public content::NotificationObserver {
+class OptionsPage2UIHandler : public WebUIMessageHandler,
+                              public content::NotificationObserver {
  public:
-  OptionsPageUIHandler();
-  virtual ~OptionsPageUIHandler();
+  OptionsPage2UIHandler();
+  virtual ~OptionsPage2UIHandler();
 
   // Is this handler enabled?
   virtual bool IsEnabled();
@@ -64,22 +64,25 @@ class OptionsPageUIHandler : public WebUIMessageHandler,
   content::NotificationRegistrar registrar_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(OptionsPageUIHandler);
+  DISALLOW_COPY_AND_ASSIGN(OptionsPage2UIHandler);
 };
 
-// An interface for common operations that a host of OptionsPageUIHandlers
+// An interface for common operations that a host of OptionsPage2UIHandlers
 // should provide.
-class OptionsPageUIHandlerHost {
+class OptionsPage2UIHandlerHost {
  public:
   virtual void InitializeHandlers() = 0;
+
+ protected:
+  virtual ~OptionsPage2UIHandlerHost() {}
 };
 
-// The WebUI for chrome:settings.
-class OptionsUI : public ChromeWebUI,
-                  public OptionsPageUIHandlerHost {
+// The WebUI for chrome:settings-frame.
+class Options2UI : public ChromeWebUI,
+                   public OptionsPage2UIHandlerHost {
  public:
-  explicit OptionsUI(TabContents* contents);
-  virtual ~OptionsUI();
+  explicit Options2UI(TabContents* contents);
+  virtual ~Options2UI();
 
   static RefCountedMemory* GetFaviconResourceBytes();
 
@@ -88,13 +91,13 @@ class OptionsUI : public ChromeWebUI,
   virtual void RenderViewReused(RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidBecomeActiveForReusedRenderView() OVERRIDE;
 
-  // Overridden from OptionsPageUIHandlerHost:
+  // Overridden from OptionsPage2UIHandlerHost:
   virtual void InitializeHandlers() OVERRIDE;
 
  private:
   // Adds OptionsPageUiHandler to the handlers list if handler is enabled.
   void AddOptionsPageUIHandler(base::DictionaryValue* localized_strings,
-                               OptionsPageUIHandler* handler);
+                               OptionsPage2UIHandler* handler);
 
   // Sets the WebUI CommandLineString property with arguments passed while
   // launching chrome.
@@ -102,7 +105,7 @@ class OptionsUI : public ChromeWebUI,
 
   bool initialized_handlers_;
 
-  DISALLOW_COPY_AND_ASSIGN(OptionsUI);
+  DISALLOW_COPY_AND_ASSIGN(Options2UI);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_H_