Options: s/options2/options/.

chrome/browser/ui/webui/options/startup_pages_handler.cc

 // Copyright (c) 2012 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/ui/webui/options2/startup_pages_handler.h"
+#include "chrome/browser/ui/webui/options/startup_pages_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
@@ skipping 19 matching lines @@
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
     { "startupAddLabel", IDS_OPTIONS_STARTUP_ADD_LABEL },
     { "startupUseCurrent", IDS_OPTIONS_STARTUP_USE_CURRENT },
     { "startupPagesPlaceholder", IDS_OPTIONS_STARTUP_PAGES_PLACEHOLDER },
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "startupPagesOverlay",
-                IDS_OPTIONS2_STARTUP_PAGES_DIALOG_TITLE);
+                IDS_OPTIONS_STARTUP_PAGES_DIALOG_TITLE);
 }
 
 void StartupPagesHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("removeStartupPages",
       base::Bind(&StartupPagesHandler::RemoveStartupPages,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("addStartupPage",
       base::Bind(&StartupPagesHandler::AddStartupPage,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("editStartupPage",
@@ skipping 194 matching lines @@
 
 void StartupPagesHandler::OnResultChanged(bool default_match_changed) {
   const AutocompleteResult& result = autocomplete_controller_->result();
   ListValue suggestions;
   OptionsUI::ProcessAutocompleteSuggestions(result, &suggestions);
   web_ui()->CallJavascriptFunction(
       "StartupOverlay.updateAutocompleteSuggestions", suggestions);
 }
 
 }  // namespace options