chrome/browser/ui/webui/options2/startup_pages_handler.cc - Issue 10698140: Remove "2" suffixes from options2 code.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 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

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/options2/startup_pages_handler2.h"	5 #include "chrome/browser/ui/webui/options2/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/string_number_conversions.h"	9 #include "base/string_number_conversions.h"

10 #include "chrome/browser/autocomplete/autocomplete_controller.h"	10 #include "chrome/browser/autocomplete/autocomplete_controller.h"

11 #include "chrome/browser/autocomplete/autocomplete_input.h"	11 #include "chrome/browser/autocomplete/autocomplete_input.h"

12 #include "chrome/browser/autocomplete/autocomplete_result.h"	12 #include "chrome/browser/autocomplete/autocomplete_result.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"

(...skipping 234 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
250	250

251 void StartupPagesHandler::OnResultChanged(bool default_match_changed) {	251 void StartupPagesHandler::OnResultChanged(bool default_match_changed) {

252 const AutocompleteResult& result = autocomplete_controller_->result();	252 const AutocompleteResult& result = autocomplete_controller_->result();

253 ListValue suggestions;	253 ListValue suggestions;

254 OptionsUI::ProcessAutocompleteSuggestions(result, &suggestions);	254 OptionsUI::ProcessAutocompleteSuggestions(result, &suggestions);

255 web_ui()->CallJavascriptFunction(	255 web_ui()->CallJavascriptFunction(

256 "StartupOverlay.updateAutocompleteSuggestions", suggestions);	256 "StartupOverlay.updateAutocompleteSuggestions", suggestions);

257 }	257 }

258	258

259 } // namespace options2	259 } // namespace options2

OLD	NEW