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

Side by Side Diff: chrome/browser/instant/instant_loader.h

Issue 10450002: Transfer user agent override info between browser and renderer (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Default to not overriding in prerender config Created 8 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
« no previous file with comments | « no previous file | chrome/browser/instant/instant_loader.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_ 5 #ifndef CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
6 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_ 6 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 // created or replaced. 189 // created or replaced.
190 void SetupPreviewContents(TabContents* tab_contents); 190 void SetupPreviewContents(TabContents* tab_contents);
191 191
192 // Creates and sets the preview TabContents. 192 // Creates and sets the preview TabContents.
193 void CreatePreviewContents(TabContents* tab_contents); 193 void CreatePreviewContents(TabContents* tab_contents);
194 194
195 // Creates and loads the |template_url|'s instant URL. 195 // Creates and loads the |template_url|'s instant URL.
196 void LoadInstantURL(const TemplateURL* template_url, 196 void LoadInstantURL(const TemplateURL* template_url,
197 content::PageTransition transition_type, 197 content::PageTransition transition_type,
198 const string16& user_text, 198 const string16& user_text,
199 bool verbatim); 199 bool verbatim,
200 bool override_user_agent);
200 201
201 InstantLoaderDelegate* delegate_; 202 InstantLoaderDelegate* delegate_;
202 203
203 // If we're showing instant results this is the ID of the TemplateURL driving 204 // If we're showing instant results this is the ID of the TemplateURL driving
204 // the results. A value of 0 means there is no TemplateURL. 205 // the results. A value of 0 means there is no TemplateURL.
205 const TemplateURLID template_url_id_; 206 const TemplateURLID template_url_id_;
206 207
207 // The url we're displaying. 208 // The url we're displaying.
208 GURL url_; 209 GURL url_;
209 210
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 std::string group_; 257 std::string group_;
257 258
258 // The session storage namespace identifier of the original tab contents that 259 // The session storage namespace identifier of the original tab contents that
259 // the preview_contents_ was based upon. 260 // the preview_contents_ was based upon.
260 scoped_refptr<content::SessionStorageNamespace> session_storage_namespace_; 261 scoped_refptr<content::SessionStorageNamespace> session_storage_namespace_;
261 262
262 DISALLOW_COPY_AND_ASSIGN(InstantLoader); 263 DISALLOW_COPY_AND_ASSIGN(InstantLoader);
263 }; 264 };
264 265
265 #endif // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_ 266 #endif // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/instant/instant_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698