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

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

Issue 566863003: Declaring the weak_ptr_factory in proper order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 #ifndef CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_
6 #define CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_ 6 #define CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 22 matching lines...) Expand all
33 33
34 // Callback to receive the path to the screensaver extension's crx and call 34 // Callback to receive the path to the screensaver extension's crx and call
35 // the unpacker to unpack and load the crx. 35 // the unpacker to unpack and load the crx.
36 void ScreensaverPathCallback(const base::FilePath& screensaver_crx); 36 void ScreensaverPathCallback(const base::FilePath& screensaver_crx);
37 37
38 // Called back on the UI thread to Setup the screensaver with the now unpacked 38 // Called back on the UI thread to Setup the screensaver with the now unpacked
39 // and loaded extension. 39 // and loaded extension.
40 void SetupScreensaver(scoped_refptr<extensions::Extension> extension, 40 void SetupScreensaver(scoped_refptr<extensions::Extension> extension,
41 const base::FilePath& extension_base_path); 41 const base::FilePath& extension_base_path);
42 42
43 base::FilePath extension_base_path_;
44
43 base::WeakPtrFactory<KioskModeScreensaver> weak_ptr_factory_; 45 base::WeakPtrFactory<KioskModeScreensaver> weak_ptr_factory_;
44 46
45 base::FilePath extension_base_path_;
46
47 DISALLOW_COPY_AND_ASSIGN(KioskModeScreensaver); 47 DISALLOW_COPY_AND_ASSIGN(KioskModeScreensaver);
48 }; 48 };
49 49
50 void InitializeKioskModeScreensaver(); 50 void InitializeKioskModeScreensaver();
51 void ShutdownKioskModeScreensaver(); 51 void ShutdownKioskModeScreensaver();
52 52
53 } // namespace chromeos 53 } // namespace chromeos
54 54
55 #endif // CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_ 55 #endif // CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698