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

Side by Side Diff: chrome/browser/ui/search/instant_search_prerenderer.cc

Issue 114883004: Add base:: namespace to straggling string16s left in chrome/browser/ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: found more Created 7 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/search/instant_search_prerenderer.h" 5 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
6 6
7 #include "chrome/browser/autocomplete/autocomplete_match.h" 7 #include "chrome/browser/autocomplete/autocomplete_match.h"
8 #include "chrome/browser/prerender/prerender_handle.h" 8 #include "chrome/browser/prerender/prerender_handle.h"
9 #include "chrome/browser/prerender/prerender_manager.h" 9 #include "chrome/browser/prerender/prerender_manager.h"
10 #include "chrome/browser/prerender/prerender_manager_factory.h" 10 #include "chrome/browser/prerender/prerender_manager_factory.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 return; 93 return;
94 94
95 if (!prerender_contents()) 95 if (!prerender_contents())
96 return; 96 return;
97 97
98 last_instant_suggestion_ = suggestion; 98 last_instant_suggestion_ = suggestion;
99 SearchTabHelper::FromWebContents(prerender_contents())-> 99 SearchTabHelper::FromWebContents(prerender_contents())->
100 SetSuggestionToPrefetch(suggestion); 100 SetSuggestionToPrefetch(suggestion);
101 } 101 }
102 102
103 void InstantSearchPrerenderer::Commit(const string16& query) { 103 void InstantSearchPrerenderer::Commit(const base::string16& query) {
104 DCHECK(prerender_handle_); 104 DCHECK(prerender_handle_);
105 DCHECK(prerender_contents()); 105 DCHECK(prerender_contents());
106 SearchTabHelper::FromWebContents(prerender_contents())->Submit(query); 106 SearchTabHelper::FromWebContents(prerender_contents())->Submit(query);
107 } 107 }
108 108
109 bool InstantSearchPrerenderer::CanCommitQuery(content::WebContents* source, 109 bool InstantSearchPrerenderer::CanCommitQuery(
110 const string16& query) const { 110 content::WebContents* source,
111 const base::string16& query) const {
111 if (!source || query.empty()) 112 if (!source || query.empty())
112 return false; 113 return false;
113 114
114 if (last_instant_suggestion_.text != query) 115 if (last_instant_suggestion_.text != query)
115 return false; 116 return false;
116 117
117 if (!prerender_handle_ || !prerender_contents()) 118 if (!prerender_handle_ || !prerender_contents())
118 return false; 119 return false;
119 120
120 // InstantSearchPrerenderer can commit query to the prerendered page only if 121 // InstantSearchPrerenderer can commit query to the prerendered page only if
121 // the underlying |source| page doesn't support Instant search. 122 // the underlying |source| page doesn't support Instant search.
122 return !PageSupportsInstantSearch(source); 123 return !PageSupportsInstantSearch(source);
123 } 124 }
124 125
125 bool InstantSearchPrerenderer::UsePrerenderedPage( 126 bool InstantSearchPrerenderer::UsePrerenderedPage(
126 const GURL& url, 127 const GURL& url,
127 chrome::NavigateParams* params) { 128 chrome::NavigateParams* params) {
128 string16 search_terms = chrome::GetSearchTermsFromURL(profile_, url); 129 base::string16 search_terms = chrome::GetSearchTermsFromURL(profile_, url);
129 prerender::PrerenderManager* prerender_manager = 130 prerender::PrerenderManager* prerender_manager =
130 prerender::PrerenderManagerFactory::GetForProfile(profile_); 131 prerender::PrerenderManagerFactory::GetForProfile(profile_);
131 if (search_terms.empty() || 132 if (search_terms.empty() ||
132 !params->target_contents || 133 !params->target_contents ||
133 last_instant_suggestion_.text != search_terms || 134 last_instant_suggestion_.text != search_terms ||
134 !prerender_contents() || 135 !prerender_contents() ||
135 !prerender_manager) { 136 !prerender_manager) {
136 Cancel(); 137 Cancel();
137 return false; 138 return false;
138 } 139 }
139 140
140 bool success = prerender_manager->MaybeUsePrerenderedPage( 141 bool success = prerender_manager->MaybeUsePrerenderedPage(
141 prerender_contents()->GetURL(), params); 142 prerender_contents()->GetURL(), params);
142 prerender_handle_.reset(); 143 prerender_handle_.reset();
143 return success; 144 return success;
144 } 145 }
145 146
146 bool InstantSearchPrerenderer::IsAllowed(const AutocompleteMatch& match, 147 bool InstantSearchPrerenderer::IsAllowed(const AutocompleteMatch& match,
147 content::WebContents* source) const { 148 content::WebContents* source) const {
148 return source && AutocompleteMatch::IsSearchType(match.type) && 149 return source && AutocompleteMatch::IsSearchType(match.type) &&
149 !PageSupportsInstantSearch(source); 150 !PageSupportsInstantSearch(source);
150 } 151 }
151 152
152 content::WebContents* InstantSearchPrerenderer::prerender_contents() const { 153 content::WebContents* InstantSearchPrerenderer::prerender_contents() const {
153 return (prerender_handle_ && prerender_handle_->contents()) ? 154 return (prerender_handle_ && prerender_handle_->contents()) ?
154 prerender_handle_->contents()->prerender_contents() : NULL; 155 prerender_handle_->contents()->prerender_contents() : NULL;
155 } 156 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/instant_search_prerenderer.h ('k') | chrome/browser/ui/search/instant_search_prerenderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698