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

Side by Side Diff: extensions/common/manifest_handlers/kiosk_mode_info.cc

Issue 107803004: Add base:: to string16 in extensions/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove a using 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "extensions/common/manifest_handlers/kiosk_mode_info.h" 5 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 26 matching lines...) Expand all
37 } 37 }
38 38
39 KioskModeHandler::KioskModeHandler() { 39 KioskModeHandler::KioskModeHandler() {
40 supported_keys_.push_back(keys::kKioskEnabled); 40 supported_keys_.push_back(keys::kKioskEnabled);
41 supported_keys_.push_back(keys::kKioskOnly); 41 supported_keys_.push_back(keys::kKioskOnly);
42 } 42 }
43 43
44 KioskModeHandler::~KioskModeHandler() { 44 KioskModeHandler::~KioskModeHandler() {
45 } 45 }
46 46
47 bool KioskModeHandler::Parse(Extension* extension, string16* error) { 47 bool KioskModeHandler::Parse(Extension* extension, base::string16* error) {
48 const Manifest* manifest = extension->manifest(); 48 const Manifest* manifest = extension->manifest();
49 DCHECK(manifest->HasKey(keys::kKioskEnabled) || 49 DCHECK(manifest->HasKey(keys::kKioskEnabled) ||
50 manifest->HasKey(keys::kKioskOnly)); 50 manifest->HasKey(keys::kKioskOnly));
51 51
52 bool kiosk_enabled = false; 52 bool kiosk_enabled = false;
53 if (manifest->HasKey(keys::kKioskEnabled) && 53 if (manifest->HasKey(keys::kKioskEnabled) &&
54 !manifest->GetBoolean(keys::kKioskEnabled, &kiosk_enabled)) { 54 !manifest->GetBoolean(keys::kKioskEnabled, &kiosk_enabled)) {
55 *error = ASCIIToUTF16(manifest_errors::kInvalidKioskEnabled); 55 *error = ASCIIToUTF16(manifest_errors::kInvalidKioskEnabled);
56 return false; 56 return false;
57 } 57 }
(...skipping 22 matching lines...) Expand all
80 new KioskModeInfo(kiosk_status)); 80 new KioskModeInfo(kiosk_status));
81 81
82 return true; 82 return true;
83 } 83 }
84 84
85 const std::vector<std::string> KioskModeHandler::Keys() const { 85 const std::vector<std::string> KioskModeHandler::Keys() const {
86 return supported_keys_; 86 return supported_keys_;
87 } 87 }
88 88
89 } // namespace extensions 89 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/manifest_handlers/kiosk_mode_info.h ('k') | extensions/common/manifest_handlers/offline_enabled_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698