diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
| commit | f0a51fb571f46531025fa09240bbc3e1af925e84 (patch) | |
| tree | 558b4f0e737fda4b9ab60f252c9c23b8a4ca523e /chrome/browser/autocomplete | |
| parent | 6390be368205705f49ead3cec40396519f13b889 (diff) | |
| download | chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.zip chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.gz chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.bz2 | |
Fixes CRLF and trailing white spaces.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_win.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/search_provider.cc | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index b420d75..0065f36 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -148,7 +148,7 @@ bool AutocompleteEditModel::GetURLForText(const std::wstring& text, UserTextFromDisplayText(text), std::wstring(), &parts, NULL); if (type != AutocompleteInput::URL) return false; - + *url = GURL(URLFixerUpper::FixupURL(WideToUTF8(text), std::string())); return true; } @@ -346,12 +346,12 @@ bool AutocompleteEditModel::OnEscapeKeyPressed() { return true; } - // If the user wasn't editing, but merely had focus in the edit, allow <esc> - // to be processed as an accelerator, so it can still be used to stop a load. - // When the permanent text isn't all selected we still fall through to the - // SelectAll() call below so users can arrow around in the text and then hit + // If the user wasn't editing, but merely had focus in the edit, allow <esc> + // to be processed as an accelerator, so it can still be used to stop a load. + // When the permanent text isn't all selected we still fall through to the + // SelectAll() call below so users can arrow around in the text and then hit // <esc> to quickly replace all the text; this matches IE. - if (!user_input_in_progress_ && view_->IsSelectAll()) + if (!user_input_in_progress_ && view_->IsSelectAll()) return false; view_->RevertAll(); diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 307f502..6df7ff4 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -593,7 +593,7 @@ void AutocompleteEditViewWin::Update( CHARRANGE sel; GetSelection(sel); const bool was_reversed = (sel.cpMin > sel.cpMax); - const bool was_sel_all = (sel.cpMin != sel.cpMax) && + const bool was_sel_all = (sel.cpMin != sel.cpMax) && IsSelectAllForRange(sel); RevertAll(); diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index 23d4407c..d462480 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -125,7 +125,7 @@ void SearchProvider::OnURLFetchComplete(const URLFetcher* source, // TODO(jungshik): Switch to CodePageToUTF8 after it's added. if (CodepageToWide(data, charset.c_str(), OnStringUtilConversionError::FAIL, &wide_data)) - json_data = WideToUTF8(wide_data); + json_data = WideToUTF8(wide_data); } } |