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

Side by Side Diff: chrome/browser/ui/webui/instant_ui.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/ui/webui/instant_ui.h" 5 #include "chrome/browser/ui/webui/instant_ui.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/prefs/pref_service.h"
8 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
9 #include "base/time.h" 10 #include "base/time.h"
10 #include "chrome/browser/instant/instant_controller.h" 11 #include "chrome/browser/instant/instant_controller.h"
11 #include "chrome/browser/prefs/pref_registry_syncable.h" 12 #include "chrome/browser/prefs/pref_registry_syncable.h"
12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_finder.h" 15 #include "chrome/browser/ui/browser_finder.h"
16 #include "chrome/browser/ui/browser_instant_controller.h" 16 #include "chrome/browser/ui/browser_instant_controller.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "chrome/common/url_constants.h" 18 #include "chrome/common/url_constants.h"
19 #include "content/public/browser/web_ui.h" 19 #include "content/public/browser/web_ui.h"
20 #include "content/public/browser/web_ui_data_source.h" 20 #include "content/public/browser/web_ui_data_source.h"
21 #include "content/public/browser/web_ui_message_handler.h" 21 #include "content/public/browser/web_ui_message_handler.h"
22 #include "grit/browser_resources.h" 22 #include "grit/browser_resources.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 // Set up the chrome://instant/ source. 147 // Set up the chrome://instant/ source.
148 Profile* profile = Profile::FromWebUI(web_ui); 148 Profile* profile = Profile::FromWebUI(web_ui);
149 content::WebUIDataSource::Add(profile, CreateInstantHTMLSource()); 149 content::WebUIDataSource::Add(profile, CreateInstantHTMLSource());
150 } 150 }
151 151
152 // static 152 // static
153 void InstantUI::RegisterUserPrefs(PrefRegistrySyncable* registry) { 153 void InstantUI::RegisterUserPrefs(PrefRegistrySyncable* registry) {
154 registry->RegisterStringPref(prefs::kInstantUIZeroSuggestUrlPrefix, "", 154 registry->RegisterStringPref(prefs::kInstantUIZeroSuggestUrlPrefix, "",
155 PrefRegistrySyncable::UNSYNCABLE_PREF); 155 PrefRegistrySyncable::UNSYNCABLE_PREF);
156 } 156 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/help/help_handler.cc ('k') | chrome/browser/ui/webui/ntp/android/promo_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698