| Index: chrome/common/extensions/api/managed_mode_private/managed_mode_handler.cc
|
| diff --git a/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.cc b/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.cc
|
| index 7690eeb54c1ea3c5bf66d4a44d225a9fdab5905a..1fbebd02ba7041c684def706395d14b505ba9778 100644
|
| --- a/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.cc
|
| +++ b/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.cc
|
| @@ -44,7 +44,7 @@ ManagedModeHandler::ManagedModeHandler() {
|
| ManagedModeHandler::~ManagedModeHandler() {
|
| }
|
|
|
| -bool ManagedModeHandler::Parse(Extension* extension, string16* error) {
|
| +bool ManagedModeHandler::Parse(Extension* extension, base::string16* error) {
|
| if (!extension->manifest()->HasKey(keys::kContentPack))
|
| return true;
|
|
|
| @@ -72,7 +72,7 @@ const std::vector<std::string> ManagedModeHandler::Keys() const {
|
| bool ManagedModeHandler::LoadSites(
|
| ManagedModeInfo* info,
|
| const base::DictionaryValue* content_pack_value,
|
| - string16* error) {
|
| + base::string16* error) {
|
| if (!content_pack_value->HasKey(keys::kContentPackSites))
|
| return true;
|
|
|
| @@ -91,7 +91,7 @@ bool ManagedModeHandler::LoadSites(
|
| bool ManagedModeHandler::LoadConfigurations(
|
| ManagedModeInfo* info,
|
| const base::DictionaryValue* content_pack_value,
|
| - string16* error) {
|
| + base::string16* error) {
|
| NOTIMPLEMENTED();
|
| return true;
|
| }
|
|
|