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

Side by Side Diff: chrome/browser/ui/webui/options2/startup_pages_handler2.cc

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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/options2/startup_pages_handler2.h" 5 #include "chrome/browser/ui/webui/options2/startup_pages_handler2.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/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h" 10 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
11 #include "chrome/browser/autocomplete/autocomplete_match.h" 11 #include "chrome/browser/autocomplete/autocomplete_match.h"
12 #include "chrome/browser/autocomplete/autocomplete.h" 12 #include "chrome/browser/autocomplete/autocomplete.h"
13 #include "chrome/browser/custom_home_pages_table_model.h" 13 #include "chrome/browser/custom_home_pages_table_model.h"
14 #include "chrome/browser/net/url_fixer_upper.h" 14 #include "chrome/browser/net/url_fixer_upper.h"
15 #include "chrome/browser/prefs/session_startup_pref.h" 15 #include "chrome/browser/prefs/session_startup_pref.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/common/chrome_notification_types.h" 17 #include "chrome/common/chrome_notification_types.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "content/browser/webui/web_ui.h"
19 #include "content/public/browser/notification_details.h" 20 #include "content/public/browser/notification_details.h"
20 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
21 22
22 namespace options2 { 23 namespace options2 {
23 24
24 StartupPagesHandler::StartupPagesHandler() 25 StartupPagesHandler::StartupPagesHandler()
25 : autocomplete_controller_(NULL), 26 : autocomplete_controller_(NULL),
26 startup_custom_pages_table_model_(NULL) { 27 startup_custom_pages_table_model_(NULL) {
27 } 28 }
28 29
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 entry->SetString("displayURL", match.contents); 259 entry->SetString("displayURL", match.contents);
259 entry->SetString("url", match.destination_url.spec()); 260 entry->SetString("url", match.destination_url.spec());
260 suggestions.Append(entry); 261 suggestions.Append(entry);
261 } 262 }
262 263
263 web_ui()->CallJavascriptFunction( 264 web_ui()->CallJavascriptFunction(
264 "StartupOverlay.updateAutocompleteSuggestions", suggestions); 265 "StartupOverlay.updateAutocompleteSuggestions", suggestions);
265 } 266 }
266 267
267 } // namespace options2 268 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698