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

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_external_updater.h

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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_APP_MODE_KIOSK_EXTERNAL_UPDATER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_EXTERNAL_UPDATER_H_
6 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_EXTERNAL_UPDATER_H_ 6 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_EXTERNAL_UPDATER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 ExternalUpdate(); 47 ExternalUpdate();
48 48
49 std::string app_name; 49 std::string app_name;
50 base::FilePath external_crx; 50 base::FilePath external_crx;
51 ExternalUpdateStatus update_status; 51 ExternalUpdateStatus update_status;
52 base::string16 error; 52 base::string16 error;
53 }; 53 };
54 54
55 // disks::DiskMountManager::Observer overrides. 55 // disks::DiskMountManager::Observer overrides.
56 virtual void OnDiskEvent(disks::DiskMountManager::DiskEvent event, 56 virtual void OnDiskEvent(disks::DiskMountManager::DiskEvent event,
57 const disks::DiskMountManager::Disk* disk) OVERRIDE; 57 const disks::DiskMountManager::Disk* disk) override;
58 virtual void OnDeviceEvent(disks::DiskMountManager::DeviceEvent event, 58 virtual void OnDeviceEvent(disks::DiskMountManager::DeviceEvent event,
59 const std::string& device_path) OVERRIDE; 59 const std::string& device_path) override;
60 virtual void OnMountEvent( 60 virtual void OnMountEvent(
61 disks::DiskMountManager::MountEvent event, 61 disks::DiskMountManager::MountEvent event,
62 MountError error_code, 62 MountError error_code,
63 const disks::DiskMountManager::MountPointInfo& mount_info) OVERRIDE; 63 const disks::DiskMountManager::MountPointInfo& mount_info) override;
64 virtual void OnFormatEvent(disks::DiskMountManager::FormatEvent event, 64 virtual void OnFormatEvent(disks::DiskMountManager::FormatEvent event,
65 FormatError error_code, 65 FormatError error_code,
66 const std::string& device_path) OVERRIDE; 66 const std::string& device_path) override;
67 67
68 // KioskExternalUpdateValidatorDelegate overrides: 68 // KioskExternalUpdateValidatorDelegate overrides:
69 virtual void OnExtenalUpdateUnpackSuccess( 69 virtual void OnExtenalUpdateUnpackSuccess(
70 const std::string& app_id, 70 const std::string& app_id,
71 const std::string& version, 71 const std::string& version,
72 const std::string& min_browser_version, 72 const std::string& min_browser_version,
73 const base::FilePath& temp_dir) OVERRIDE; 73 const base::FilePath& temp_dir) override;
74 virtual void OnExternalUpdateUnpackFailure( 74 virtual void OnExternalUpdateUnpackFailure(
75 const std::string& app_id) OVERRIDE; 75 const std::string& app_id) override;
76 76
77 // Processes the parsed external update manifest, check |parsing_error| for 77 // Processes the parsed external update manifest, check |parsing_error| for
78 // any manifest parsing error. 78 // any manifest parsing error.
79 void ProcessParsedManifest(ExternalUpdateErrorCode* parsing_error, 79 void ProcessParsedManifest(ExternalUpdateErrorCode* parsing_error,
80 const base::FilePath& external_update_dir, 80 const base::FilePath& external_update_dir,
81 base::DictionaryValue* parsed_manifest); 81 base::DictionaryValue* parsed_manifest);
82 82
83 // Returns true if |external_update_| is interrupted before the updating 83 // Returns true if |external_update_| is interrupted before the updating
84 // completes. 84 // completes.
85 bool CheckExternalUpdateInterrupted(); 85 bool CheckExternalUpdateInterrupted();
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 scoped_ptr<KioskExternalUpdateNotification> notification_; 145 scoped_ptr<KioskExternalUpdateNotification> notification_;
146 146
147 base::WeakPtrFactory<KioskExternalUpdater> weak_factory_; 147 base::WeakPtrFactory<KioskExternalUpdater> weak_factory_;
148 148
149 DISALLOW_COPY_AND_ASSIGN(KioskExternalUpdater); 149 DISALLOW_COPY_AND_ASSIGN(KioskExternalUpdater);
150 }; 150 };
151 151
152 } // namespace chromeos 152 } // namespace chromeos
153 153
154 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_EXTERNAL_UPDATER_H_ 154 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_EXTERNAL_UPDATER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698