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

Side by Side Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files. (Closed)
Patch Set: mac and linux fixes Created 11 years, 3 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/tab_contents/tab_contents.h" 5 #include "chrome/browser/tab_contents/tab_contents.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/file_version_info.h" 9 #include "base/file_version_info.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 1990 matching lines...) Expand 10 before | Expand all | Expand 10 after
2001 page_id); 2001 page_id);
2002 if (!entry || !UpdateTitleForEntry(entry, title)) 2002 if (!entry || !UpdateTitleForEntry(entry, title))
2003 return; 2003 return;
2004 2004
2005 // Broadcast notifications when the UI should be updated. 2005 // Broadcast notifications when the UI should be updated.
2006 if (entry == controller_.GetEntryAtOffset(0)) 2006 if (entry == controller_.GetEntryAtOffset(0))
2007 NotifyNavigationStateChanged(INVALIDATE_TAB); 2007 NotifyNavigationStateChanged(INVALIDATE_TAB);
2008 } 2008 }
2009 2009
2010 void TabContents::UpdateEncoding(RenderViewHost* render_view_host, 2010 void TabContents::UpdateEncoding(RenderViewHost* render_view_host,
2011 const std::wstring& encoding) { 2011 const std::string& encoding) {
2012 set_encoding(encoding); 2012 set_encoding(encoding);
2013 } 2013 }
2014 2014
2015 void TabContents::UpdateTargetURL(int32 page_id, const GURL& url) { 2015 void TabContents::UpdateTargetURL(int32 page_id, const GURL& url) {
2016 if (delegate()) 2016 if (delegate())
2017 delegate()->UpdateTargetURL(this, url); 2017 delegate()->UpdateTargetURL(this, url);
2018 } 2018 }
2019 2019
2020 void TabContents::UpdateThumbnail(const GURL& url, 2020 void TabContents::UpdateThumbnail(const GURL& url,
2021 const SkBitmap& bitmap, 2021 const SkBitmap& bitmap,
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
2489 render_view_host()->SyncRendererPrefs(); 2489 render_view_host()->SyncRendererPrefs();
2490 break; 2490 break;
2491 } 2491 }
2492 #endif 2492 #endif
2493 2493
2494 default: 2494 default:
2495 NOTREACHED(); 2495 NOTREACHED();
2496 } 2496 }
2497 } 2497 }
2498 2498
2499 void TabContents::set_encoding(const std::wstring& encoding) { 2499 void TabContents::set_encoding(const std::string& encoding) {
2500 encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding); 2500 encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
2501 } 2501 }
2502 2502
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.h ('k') | chrome/browser/tab_contents/web_contents_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698