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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.h

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h" 9 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
10 #include "chrome/browser/prefs/pref_change_registrar.h" 10 #include "chrome/browser/prefs/pref_change_registrar.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 void RequestAutocompleteSuggestions(const ListValue* args); 87 void RequestAutocompleteSuggestions(const ListValue* args);
88 88
89 // Called when the 'Always show the bookmarks bar' checkbox is toggled. 89 // Called when the 'Always show the bookmarks bar' checkbox is toggled.
90 // Notifies any listeners interested in this event. |args| is ignored. 90 // Notifies any listeners interested in this event. |args| is ignored.
91 void ToggleShowBookmarksBar(const ListValue* args); 91 void ToggleShowBookmarksBar(const ListValue* args);
92 92
93 // Enables/disables Instant. 93 // Enables/disables Instant.
94 void EnableInstant(const ListValue* args); 94 void EnableInstant(const ListValue* args);
95 void DisableInstant(const ListValue* args); 95 void DisableInstant(const ListValue* args);
96 96
97 // Called to request information about the Instant field trial.
98 void GetInstantFieldTrialStatus(const ListValue* args);
99
100 // Returns the string ID for the given default browser state. 97 // Returns the string ID for the given default browser state.
101 int StatusStringIdForState(ShellIntegration::DefaultWebClientState state); 98 int StatusStringIdForState(ShellIntegration::DefaultWebClientState state);
102 99
103 // Gets the current default browser state, and asynchronously reports it to 100 // Gets the current default browser state, and asynchronously reports it to
104 // the WebUI page. 101 // the WebUI page.
105 void UpdateDefaultBrowserState(); 102 void UpdateDefaultBrowserState();
106 103
107 // Updates the UI with the given state for the default browser. 104 // Updates the UI with the given state for the default browser.
108 void SetDefaultBrowserUIString(int status_string_id); 105 void SetDefaultBrowserUIString(int status_string_id);
109 106
(...skipping 22 matching lines...) Expand all
132 // CustomHomePagesTableModel, consider changing it to something more like 129 // CustomHomePagesTableModel, consider changing it to something more like
133 // TemplateURLService. 130 // TemplateURLService.
134 scoped_ptr<CustomHomePagesTableModel> startup_custom_pages_table_model_; 131 scoped_ptr<CustomHomePagesTableModel> startup_custom_pages_table_model_;
135 132
136 scoped_ptr<AutocompleteController> autocomplete_controller_; 133 scoped_ptr<AutocompleteController> autocomplete_controller_;
137 134
138 DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler); 135 DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler);
139 }; 136 };
140 137
141 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_ 138 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_BROWSER_OPTIONS_HANDLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/browser_options.js ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698