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

Side by Side Diff: chrome/browser/prerender/prerender_contents.cc

Issue 6901003: Revert my recent changes regarding title directionality. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copyrights Created 9 years, 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/prerender/prerender_contents.h" 5 #include "chrome/browser/prerender/prerender_contents.h"
6 6
7 #include "base/i18n/rtl.h"
8 #include "base/process_util.h" 7 #include "base/process_util.h"
9 #include "base/task.h" 8 #include "base/task.h"
10 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/background_contents_service.h" 10 #include "chrome/browser/background_contents_service.h"
12 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/prerender/prerender_final_status.h" 12 #include "chrome/browser/prerender/prerender_final_status.h"
14 #include "chrome/browser/prerender/prerender_manager.h" 13 #include "chrome/browser/prerender/prerender_manager.h"
15 #include "chrome/browser/prerender/prerender_render_widget_host_view.h" 14 #include "chrome/browser/prerender/prerender_render_widget_host_view.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/renderer_preferences_util.h" 16 #include "chrome/browser/renderer_preferences_util.h"
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 navigate_params_.reset(p); 269 navigate_params_.reset(p);
271 270
272 if (!AddAliasURL(params.url)) { 271 if (!AddAliasURL(params.url)) {
273 Destroy(FINAL_STATUS_HTTPS); 272 Destroy(FINAL_STATUS_HTTPS);
274 return; 273 return;
275 } 274 }
276 275
277 url_ = params.url; 276 url_ = params.url;
278 } 277 }
279 278
280 void PrerenderContents::UpdateTitle( 279 void PrerenderContents::UpdateTitle(RenderViewHost* render_view_host,
281 RenderViewHost* render_view_host, 280 int32 page_id,
282 int32 page_id, 281 const std::wstring& title) {
283 const base::i18n::String16WithDirection& title) {
284 DCHECK_EQ(render_view_host_, render_view_host); 282 DCHECK_EQ(render_view_host_, render_view_host);
285 if (title.string().empty()) 283 if (title.empty())
286 return; 284 return;
287 285
288 // TODO(evan): use directionality of title. 286 title_ = WideToUTF16Hack(title);
289 // http://code.google.com/p/chromium/issues/detail?id=27094
290 title_ = title.string();
291 page_id_ = page_id; 287 page_id_ = page_id;
292 } 288 }
293 289
294 void PrerenderContents::RunJavaScriptMessage( 290 void PrerenderContents::RunJavaScriptMessage(
295 const std::wstring& message, 291 const std::wstring& message,
296 const std::wstring& default_prompt, 292 const std::wstring& default_prompt,
297 const GURL& frame_url, 293 const GURL& frame_url,
298 const int flags, 294 const int flags,
299 IPC::Message* reply_msg, 295 IPC::Message* reply_msg,
300 bool* did_suppress_message) { 296 bool* did_suppress_message) {
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 return; 565 return;
570 566
571 size_t private_bytes, shared_bytes; 567 size_t private_bytes, shared_bytes;
572 if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) { 568 if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
573 if (private_bytes > kMaxPrerenderPrivateMB * 1024 * 1024) 569 if (private_bytes > kMaxPrerenderPrivateMB * 1024 * 1024)
574 Destroy(FINAL_STATUS_MEMORY_LIMIT_EXCEEDED); 570 Destroy(FINAL_STATUS_MEMORY_LIMIT_EXCEEDED);
575 } 571 }
576 } 572 }
577 573
578 } // namespace prerender 574 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698