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

Side by Side Diff: chrome/browser/ui/webui/options/startup_pages_handler.cc

Issue 16703018: Rewrite scoped_ptr<T>(NULL) to use the default ctor in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/options/startup_pages_handler.h" 5 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 10 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
11 #include "chrome/browser/autocomplete/autocomplete_controller.h" 11 #include "chrome/browser/autocomplete/autocomplete_controller.h"
12 #include "chrome/browser/autocomplete/autocomplete_input.h" 12 #include "chrome/browser/autocomplete/autocomplete_input.h"
13 #include "chrome/browser/autocomplete/autocomplete_result.h" 13 #include "chrome/browser/autocomplete/autocomplete_result.h"
14 #include "chrome/browser/custom_home_pages_table_model.h" 14 #include "chrome/browser/custom_home_pages_table_model.h"
15 #include "chrome/browser/net/url_fixer_upper.h" 15 #include "chrome/browser/net/url_fixer_upper.h"
16 #include "chrome/browser/prefs/session_startup_pref.h" 16 #include "chrome/browser/prefs/session_startup_pref.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/common/chrome_notification_types.h" 18 #include "chrome/common/chrome_notification_types.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "content/public/browser/notification_details.h" 20 #include "content/public/browser/notification_details.h"
21 #include "content/public/browser/web_ui.h" 21 #include "content/public/browser/web_ui.h"
22 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
23 23
24 namespace options { 24 namespace options {
25 25
26 StartupPagesHandler::StartupPagesHandler() 26 StartupPagesHandler::StartupPagesHandler() {}
27 : startup_custom_pages_table_model_(NULL) {
28 }
29 27
30 StartupPagesHandler::~StartupPagesHandler() { 28 StartupPagesHandler::~StartupPagesHandler() {
31 29
32 } 30 }
33 31
34 void StartupPagesHandler::GetLocalizedValues( 32 void StartupPagesHandler::GetLocalizedValues(
35 DictionaryValue* localized_strings) { 33 DictionaryValue* localized_strings) {
36 DCHECK(localized_strings); 34 DCHECK(localized_strings);
37 35
38 static OptionsStringResource resources[] = { 36 static OptionsStringResource resources[] = {
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 231
234 void StartupPagesHandler::OnResultChanged(bool default_match_changed) { 232 void StartupPagesHandler::OnResultChanged(bool default_match_changed) {
235 const AutocompleteResult& result = autocomplete_controller_->result(); 233 const AutocompleteResult& result = autocomplete_controller_->result();
236 ListValue suggestions; 234 ListValue suggestions;
237 OptionsUI::ProcessAutocompleteSuggestions(result, &suggestions); 235 OptionsUI::ProcessAutocompleteSuggestions(result, &suggestions);
238 web_ui()->CallJavascriptFunction( 236 web_ui()->CallJavascriptFunction(
239 "StartupOverlay.updateAutocompleteSuggestions", suggestions); 237 "StartupOverlay.updateAutocompleteSuggestions", suggestions);
240 } 238 }
241 239
242 } // namespace options 240 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698