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

Unified Diff: chrome_frame/turndown_prompt/turndown_prompt_window.cc

Issue 113143006: Add base:: to string16 in chrome_frame/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/turndown_prompt/turndown_prompt_window.h ('k') | chrome_frame/utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/turndown_prompt/turndown_prompt_window.cc
diff --git a/chrome_frame/turndown_prompt/turndown_prompt_window.cc b/chrome_frame/turndown_prompt/turndown_prompt_window.cc
index d2174da9792a0e514ffe55fd7ee3f35556cb2a7e..e0da6f381e4e5da15ad6ac273564725fbe4356bc 100644
--- a/chrome_frame/turndown_prompt/turndown_prompt_window.cc
+++ b/chrome_frame/turndown_prompt/turndown_prompt_window.cc
@@ -51,7 +51,7 @@ base::WeakPtr<TurndownPromptWindow> TurndownPromptWindow::CreateInstance(
// Substitute the proper text given the current IE version.
CWindow text = instance->GetDlgItem(IDC_TD_PROMPT_MESSAGE);
- string16 prompt_text(GetPromptText());
+ base::string16 prompt_text(GetPromptText());
if (!prompt_text.empty())
text.SetWindowText(prompt_text.c_str());
@@ -102,7 +102,7 @@ LRESULT TurndownPromptWindow::OnUninstall(WORD /*wNotifyCode*/,
}
// static
-string16 TurndownPromptWindow::GetPromptText() {
+base::string16 TurndownPromptWindow::GetPromptText() {
IEVersion ie_version = GetIEVersion();
int message_id = IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_NEWER;
if (ie_version == IE_6 || ie_version == IE_7 || ie_version == IE_8)
« no previous file with comments | « chrome_frame/turndown_prompt/turndown_prompt_window.h ('k') | chrome_frame/utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698