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

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

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 months 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
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 "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 public: 63 public:
64 ScreensaverUnpackerClient(const base::FilePath& crx_path, 64 ScreensaverUnpackerClient(const base::FilePath& crx_path,
65 const UnpackCallback& unpacker_callback) 65 const UnpackCallback& unpacker_callback)
66 : crx_path_(crx_path), 66 : crx_path_(crx_path),
67 unpack_callback_(unpacker_callback) {} 67 unpack_callback_(unpacker_callback) {}
68 68
69 virtual void OnUnpackSuccess(const base::FilePath& temp_dir, 69 virtual void OnUnpackSuccess(const base::FilePath& temp_dir,
70 const base::FilePath& extension_root, 70 const base::FilePath& extension_root,
71 const base::DictionaryValue* original_manifest, 71 const base::DictionaryValue* original_manifest,
72 const Extension* extension, 72 const Extension* extension,
73 const SkBitmap& install_icon) OVERRIDE; 73 const SkBitmap& install_icon) override;
74 virtual void OnUnpackFailure(const base::string16& error) OVERRIDE; 74 virtual void OnUnpackFailure(const base::string16& error) override;
75 75
76 protected: 76 protected:
77 virtual ~ScreensaverUnpackerClient() {} 77 virtual ~ScreensaverUnpackerClient() {}
78 78
79 private: 79 private:
80 void LoadScreensaverExtension( 80 void LoadScreensaverExtension(
81 const base::FilePath& extension_base_path, 81 const base::FilePath& extension_base_path,
82 const base::FilePath& screensaver_extension_path); 82 const base::FilePath& screensaver_extension_path);
83 83
84 void NotifyAppPackOfDamagedFile(); 84 void NotifyAppPackOfDamagedFile();
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 309
310 g_kiosk_mode_screensaver = new KioskModeScreensaver(); 310 g_kiosk_mode_screensaver = new KioskModeScreensaver();
311 } 311 }
312 312
313 void ShutdownKioskModeScreensaver() { 313 void ShutdownKioskModeScreensaver() {
314 delete g_kiosk_mode_screensaver; 314 delete g_kiosk_mode_screensaver;
315 g_kiosk_mode_screensaver = NULL; 315 g_kiosk_mode_screensaver = NULL;
316 } 316 }
317 317
318 } // namespace chromeos 318 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698