Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2367)

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 7461075: Revert 94073 (broke a ton of tests) - Introduce a field trial for Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
===================================================================
--- chrome/browser/ui/webui/options/browser_options_handler.cc (revision 94076)
+++ chrome/browser/ui/webui/options/browser_options_handler.cc (working copy)
@@ -16,7 +16,6 @@
#include "chrome/browser/custom_home_pages_table_model.h"
#include "chrome/browser/instant/instant_confirm_dialog.h"
#include "chrome/browser/instant/instant_controller.h"
-#include "chrome/browser/instant/instant_field_trial.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/session_startup_pref.h"
@@ -130,9 +129,6 @@
web_ui_->RegisterMessageCallback(
"disableInstant",
NewCallback(this, &BrowserOptionsHandler::DisableInstant));
- web_ui_->RegisterMessageCallback(
- "getInstantFieldTrialStatus",
- NewCallback(this, &BrowserOptionsHandler::GetInstantFieldTrialStatus));
}
void BrowserOptionsHandler::Initialize() {
@@ -488,13 +484,6 @@
InstantController::Disable(web_ui_->GetProfile());
}
-void BrowserOptionsHandler::GetInstantFieldTrialStatus(const ListValue* args) {
- FundamentalValue enabled(
- InstantFieldTrial::IsExperimentGroup(web_ui_->GetProfile()));
- web_ui_->CallJavascriptFunction("BrowserOptions.setInstantFieldTrialStatus",
- enabled);
-}
-
void BrowserOptionsHandler::OnResultChanged(bool default_match_changed) {
const AutocompleteResult& result = autocomplete_controller_->result();
ListValue suggestions;
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698