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

Unified Diff: cloud_print/service/win/service_controller.h

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/local_security_policy.cc ('k') | cloud_print/service/win/service_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cloud_print/service/win/service_controller.h
diff --git a/cloud_print/service/win/service_controller.h b/cloud_print/service/win/service_controller.h
index 167b0c1a3af9321107f1440460fcd32f17a7ef23..3b1781e815e8db7b8736945be8f86e74f022e2a0 100644
--- a/cloud_print/service/win/service_controller.h
+++ b/cloud_print/service/win/service_controller.h
@@ -32,13 +32,13 @@ class ServiceController {
~ServiceController();
// Installs temporarily service to check pre-requirements.
- HRESULT InstallCheckService(const string16& user,
- const string16& password,
+ HRESULT InstallCheckService(const base::string16& user,
+ const base::string16& password,
const base::FilePath& user_data_dir);
// Installs real service that will run connector.
- HRESULT InstallConnectorService(const string16& user,
- const string16& password,
+ HRESULT InstallConnectorService(const base::string16& user,
+ const base::string16& password,
const base::FilePath& user_data_dir,
bool enable_logging);
@@ -52,22 +52,22 @@ class ServiceController {
// Query service status and options. Results accessible with getters below.
void UpdateState();
State state() const { return state_; }
- const string16& user() const { return user_; }
+ const base::string16& user() const { return user_; }
bool is_logging_enabled() const;
base::FilePath GetBinary() const;
private:
- HRESULT InstallService(const string16& user,
- const string16& password,
+ HRESULT InstallService(const base::string16& user,
+ const base::string16& password,
bool auto_start,
const std::string& run_switch,
const base::FilePath& user_data_dir,
bool enable_logging);
- const string16 name_;
+ const base::string16 name_;
State state_;
- string16 user_;
+ base::string16 user_;
bool is_logging_enabled_;
CommandLine command_line_;
};
« no previous file with comments | « cloud_print/service/win/local_security_policy.cc ('k') | cloud_print/service/win/service_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698