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

Side by Side Diff: chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

Issue 105193002: Replace string16 with base::string16. (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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" 5 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
6 6
7 #include "ash/screensaver/screensaver_view.h" 7 #include "ash/screensaver/screensaver_view.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/wm/user_activity_detector.h" 9 #include "ash/wm/user_activity_detector.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 ScreensaverUnpackerClient(const base::FilePath& crx_path, 54 ScreensaverUnpackerClient(const base::FilePath& crx_path,
55 const UnpackCallback& unpacker_callback) 55 const UnpackCallback& unpacker_callback)
56 : crx_path_(crx_path), 56 : crx_path_(crx_path),
57 unpack_callback_(unpacker_callback) {} 57 unpack_callback_(unpacker_callback) {}
58 58
59 virtual void OnUnpackSuccess(const base::FilePath& temp_dir, 59 virtual void OnUnpackSuccess(const base::FilePath& temp_dir,
60 const base::FilePath& extension_root, 60 const base::FilePath& extension_root,
61 const base::DictionaryValue* original_manifest, 61 const base::DictionaryValue* original_manifest,
62 const Extension* extension, 62 const Extension* extension,
63 const SkBitmap& install_icon) OVERRIDE; 63 const SkBitmap& install_icon) OVERRIDE;
64 virtual void OnUnpackFailure(const string16& error) OVERRIDE; 64 virtual void OnUnpackFailure(const base::string16& error) OVERRIDE;
65 65
66 protected: 66 protected:
67 virtual ~ScreensaverUnpackerClient() {} 67 virtual ~ScreensaverUnpackerClient() {}
68 68
69 private: 69 private:
70 void LoadScreensaverExtension( 70 void LoadScreensaverExtension(
71 const base::FilePath& extension_base_path, 71 const base::FilePath& extension_base_path,
72 const base::FilePath& screensaver_extension_path); 72 const base::FilePath& screensaver_extension_path);
73 73
74 void NotifyAppPackOfDamagedFile(); 74 void NotifyAppPackOfDamagedFile();
(...skipping 12 matching lines...) Expand all
87 const SkBitmap& install_icon) { 87 const SkBitmap& install_icon) {
88 content::BrowserThread::PostTask( 88 content::BrowserThread::PostTask(
89 content::BrowserThread::FILE, 89 content::BrowserThread::FILE,
90 FROM_HERE, 90 FROM_HERE,
91 base::Bind(&ScreensaverUnpackerClient::LoadScreensaverExtension, 91 base::Bind(&ScreensaverUnpackerClient::LoadScreensaverExtension,
92 this, 92 this,
93 temp_dir, 93 temp_dir,
94 extension_root)); 94 extension_root));
95 } 95 }
96 96
97 void ScreensaverUnpackerClient::OnUnpackFailure(const string16& error) { 97 void ScreensaverUnpackerClient::OnUnpackFailure(const base::string16& error) {
98 LOG(ERROR) << "Couldn't unpack screensaver extension. Error: " << error; 98 LOG(ERROR) << "Couldn't unpack screensaver extension. Error: " << error;
99 NotifyAppPackOfDamagedFile(); 99 NotifyAppPackOfDamagedFile();
100 } 100 }
101 101
102 void ScreensaverUnpackerClient::LoadScreensaverExtension( 102 void ScreensaverUnpackerClient::LoadScreensaverExtension(
103 const base::FilePath& extension_base_path, 103 const base::FilePath& extension_base_path,
104 const base::FilePath& screensaver_extension_path) { 104 const base::FilePath& screensaver_extension_path) {
105 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); 105 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
106 106
107 ExtensionService* service = GetDefaultExtensionService(); 107 ExtensionService* service = GetDefaultExtensionService();
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 300
301 g_kiosk_mode_screensaver = new KioskModeScreensaver(); 301 g_kiosk_mode_screensaver = new KioskModeScreensaver();
302 } 302 }
303 303
304 void ShutdownKioskModeScreensaver() { 304 void ShutdownKioskModeScreensaver() {
305 delete g_kiosk_mode_screensaver; 305 delete g_kiosk_mode_screensaver;
306 g_kiosk_mode_screensaver = NULL; 306 g_kiosk_mode_screensaver = NULL;
307 } 307 }
308 308
309 } // namespace chromeos 309 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/textinput_test_helper.cc ('k') | chrome/browser/chromeos/locale_change_guard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698