Index: chrome/browser/ui/webui/options2/browser_options_handler.cc |
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler.cc b/chrome/browser/ui/webui/options2/browser_options_handler.cc |
index 5dc5be28191f767fa0e13b5b4043dd07e5f97b1c..033778fa3efdafc5c5e6b39ad3496cc36c2cf468 100644 |
--- a/chrome/browser/ui/webui/options2/browser_options_handler.cc |
+++ b/chrome/browser/ui/webui/options2/browser_options_handler.cc |
@@ -23,7 +23,6 @@ |
#include "chrome/browser/chrome_page_zoom.h" |
#include "chrome/browser/custom_home_pages_table_model.h" |
#include "chrome/browser/download/download_prefs.h" |
-#include "chrome/browser/instant/instant_controller.h" |
#include "chrome/browser/net/url_fixer_upper.h" |
#include "chrome/browser/prefs/pref_service.h" |
#include "chrome/browser/prefs/session_startup_pref.h" |
@@ -433,14 +432,6 @@ void BrowserOptionsHandler::RegisterMessages() { |
base::Bind(&BrowserOptionsHandler::SetDefaultSearchEngine, |
base::Unretained(this))); |
web_ui()->RegisterMessageCallback( |
- "enableInstant", |
- base::Bind(&BrowserOptionsHandler::EnableInstant, |
- base::Unretained(this))); |
- web_ui()->RegisterMessageCallback( |
- "disableInstant", |
- base::Bind(&BrowserOptionsHandler::DisableInstant, |
- base::Unretained(this))); |
- web_ui()->RegisterMessageCallback( |
"createProfile", |
base::Bind(&BrowserOptionsHandler::CreateProfile, |
base::Unretained(this))); |
@@ -879,14 +870,6 @@ void BrowserOptionsHandler::Observe( |
} |
} |
-void BrowserOptionsHandler::EnableInstant(const ListValue* args) { |
- InstantController::Enable(Profile::FromWebUI(web_ui())); |
-} |
- |
-void BrowserOptionsHandler::DisableInstant(const ListValue* args) { |
- InstantController::Disable(Profile::FromWebUI(web_ui())); |
-} |
- |
void BrowserOptionsHandler::ToggleAutoLaunch(const ListValue* args) { |
#if defined(OS_WIN) |
if (!auto_launch_trial::IsInAutoLaunchGroup()) |