| OLD | NEW |
| 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/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 9 #include "base/time.h" | 9 #include "base/time.h" |
| 10 #include "chrome/browser/instant/instant_controller.h" | 10 #include "chrome/browser/instant/instant_controller.h" |
| 11 #include "chrome/browser/prefs/pref_registry_syncable.h" |
| 11 #include "chrome/browser/prefs/pref_service.h" | 12 #include "chrome/browser/prefs/pref_service.h" |
| 12 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 13 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/browser_finder.h" | 15 #include "chrome/browser/ui/browser_finder.h" |
| 15 #include "chrome/browser/ui/browser_instant_controller.h" | 16 #include "chrome/browser/ui/browser_instant_controller.h" |
| 16 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 17 #include "chrome/common/url_constants.h" | 18 #include "chrome/common/url_constants.h" |
| 18 #include "content/public/browser/web_ui.h" | 19 #include "content/public/browser/web_ui.h" |
| 19 #include "content/public/browser/web_ui_data_source.h" | 20 #include "content/public/browser/web_ui_data_source.h" |
| 20 #include "content/public/browser/web_ui_message_handler.h" | 21 #include "content/public/browser/web_ui_message_handler.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 | 143 |
| 143 InstantUI::InstantUI(content::WebUI* web_ui) : WebUIController(web_ui) { | 144 InstantUI::InstantUI(content::WebUI* web_ui) : WebUIController(web_ui) { |
| 144 web_ui->AddMessageHandler(new InstantUIMessageHandler()); | 145 web_ui->AddMessageHandler(new InstantUIMessageHandler()); |
| 145 | 146 |
| 146 // Set up the chrome://instant/ source. | 147 // Set up the chrome://instant/ source. |
| 147 Profile* profile = Profile::FromWebUI(web_ui); | 148 Profile* profile = Profile::FromWebUI(web_ui); |
| 148 content::WebUIDataSource::Add(profile, CreateInstantHTMLSource()); | 149 content::WebUIDataSource::Add(profile, CreateInstantHTMLSource()); |
| 149 } | 150 } |
| 150 | 151 |
| 151 // static | 152 // static |
| 152 void InstantUI::RegisterUserPrefs(PrefServiceSyncable* user_prefs) { | 153 void InstantUI::RegisterUserPrefs(PrefRegistrySyncable* registry) { |
| 153 user_prefs->RegisterStringPref(prefs::kInstantUIZeroSuggestUrlPrefix, "", | 154 registry->RegisterStringPref(prefs::kInstantUIZeroSuggestUrlPrefix, "", |
| 154 PrefServiceSyncable::UNSYNCABLE_PREF); | 155 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 155 } | 156 } |
| OLD | NEW |