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

Unified Diff: cloud_print/service/win/cloud_print_service_config.cc

Issue 107383002: Use base namespace for string16 in components and cloud_print. (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 | « cloud_print/service/win/cloud_print_service.cc ('k') | cloud_print/service/win/local_security_policy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cloud_print/service/win/cloud_print_service_config.cc
diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc
index ce31e19c1b27af99a84c128188e26579b8aae20f..d7321f2c592d2494d087b45193df2218446d2de6 100644
--- a/cloud_print/service/win/cloud_print_service_config.cc
+++ b/cloud_print/service/win/cloud_print_service_config.cc
@@ -77,15 +77,15 @@ class SetupDialog : public base::RefCounted<SetupDialog>,
// Disables all controls after users actions.
void DisableControls();
// Updates state of controls after when we received service status.
- void SetState(ServiceController::State state, const string16& user,
+ void SetState(ServiceController::State state, const base::string16& user,
bool is_logging_enabled);
// Show message box with error.
- void ShowErrorMessageBox(const string16& error_message);
+ void ShowErrorMessageBox(const base::string16& error_message);
// Show use message box instructions how to deal with opened Chrome window.
void AskToCloseChrome();
- string16 GetDlgItemText(int id) const;
- string16 GetUser() const;
- string16 GetPassword() const;
+ base::string16 GetDlgItemText(int id) const;
+ base::string16 GetUser() const;
+ base::string16 GetPassword() const;
bool IsLoggingEnabled() const;
bool IsInstalled() const {
return state_ > ServiceController::STATE_NOT_FOUND;
@@ -93,7 +93,7 @@ class SetupDialog : public base::RefCounted<SetupDialog>,
// IO Calls.
// Installs service.
- void Install(const string16& user, const string16& password,
+ void Install(const base::string16& user, const base::string16& password,
bool enable_logging);
// Starts service.
void Start();
@@ -106,7 +106,7 @@ class SetupDialog : public base::RefCounted<SetupDialog>,
// Posts task to UI thread to show error using string id.
void ShowError(int string_id);
// Posts task to UI thread to show error using string.
- void ShowError(const string16& error_message);
+ void ShowError(const base::string16& error_message);
// Posts task to UI thread to show error using error code.
void ShowError(HRESULT hr);
@@ -139,7 +139,7 @@ void SetupDialog::PostIOTask(const base::Closure& task) {
io_loop_->PostTask(FROM_HERE, task);
}
-void SetupDialog::ShowErrorMessageBox(const string16& error_message) {
+void SetupDialog::ShowErrorMessageBox(const base::string16& error_message) {
DCHECK(base::MessageLoop::current()->IsType(base::MessageLoop::TYPE_UI));
MessageBox(error_message.c_str(),
LoadLocalString(IDS_OPERATION_FAILED_TITLE).c_str(),
@@ -154,7 +154,7 @@ void SetupDialog::AskToCloseChrome() {
}
void SetupDialog::SetState(ServiceController::State status,
- const string16& user,
+ const base::string16& user,
bool is_logging_enabled) {
DCHECK(base::MessageLoop::current()->IsType(base::MessageLoop::TYPE_UI));
state_ = status;
@@ -282,19 +282,19 @@ void SetupDialog::DisableControls() {
GetDlgItem(IDC_LOGGING).EnableWindow(FALSE);
}
-string16 SetupDialog::GetDlgItemText(int id) const {
+base::string16 SetupDialog::GetDlgItemText(int id) const {
const ATL::CWindow& item = GetDlgItem(id);
size_t length = item.GetWindowTextLength();
- string16 result(length + 1, L'\0');
+ base::string16 result(length + 1, L'\0');
result.resize(item.GetWindowText(&result[0], result.size()));
return result;
}
-string16 SetupDialog::GetUser() const {
+base::string16 SetupDialog::GetUser() const {
return GetDlgItemText(IDC_USER);
}
-string16 SetupDialog::GetPassword() const{
+base::string16 SetupDialog::GetPassword() const {
return GetDlgItemText(IDC_PASSWORD);
}
@@ -309,7 +309,7 @@ void SetupDialog::UpdateState() {
controller_.user(), controller_.is_logging_enabled()));
}
-void SetupDialog::ShowError(const string16& error_message) {
+void SetupDialog::ShowError(const base::string16& error_message) {
DCHECK(base::MessageLoop::current()->IsType(base::MessageLoop::TYPE_IO));
PostUITask(base::Bind(&SetupDialog::SetState,
this,
@@ -329,7 +329,8 @@ void SetupDialog::ShowError(HRESULT hr) {
ShowError(GetErrorMessage(hr));
}
-void SetupDialog::Install(const string16& user, const string16& password,
+void SetupDialog::Install(const base::string16& user,
+ const base::string16& password,
bool enable_logging) {
// Don't forget to update state on exit.
base::ScopedClosureRunner scoped_update_status(
« no previous file with comments | « cloud_print/service/win/cloud_print_service.cc ('k') | cloud_print/service/win/local_security_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698