summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-15 20:54:15 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-15 20:54:15 +0000
commit5d34821d9acf6e35968fdfb1fdcef8528b3fd5c2 (patch)
treed508239df4be42493762c02796b2b0a5234d3977
parent5dadf84c9e01eb46f40c1bcf633144caabfebac4 (diff)
downloadchromium_src-5d34821d9acf6e35968fdfb1fdcef8528b3fd5c2.zip
chromium_src-5d34821d9acf6e35968fdfb1fdcef8528b3fd5c2.tar.gz
chromium_src-5d34821d9acf6e35968fdfb1fdcef8528b3fd5c2.tar.bz2
cros: More clang plugin appeasing.
BUG=none TEST=none TBR=dpolukhin Review URL: http://codereview.chromium.org/7027005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85424 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/cros/mount_library.cc2
-rw-r--r--chrome/browser/chromeos/cros/mount_library.h2
-rw-r--r--chrome/browser/chromeos/customization_document.cc4
-rw-r--r--chrome/browser/chromeos/customization_document.h4
-rw-r--r--chrome/browser/chromeos/enterprise_extension_observer.h6
-rw-r--r--chrome/browser/chromeos/notifications/balloon_collection_impl.cc4
-rw-r--r--chrome/browser/chromeos/notifications/balloon_collection_impl.h2
7 files changed, 20 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/cros/mount_library.cc b/chrome/browser/chromeos/cros/mount_library.cc
index c0281df..523de2a 100644
--- a/chrome/browser/chromeos/cros/mount_library.cc
+++ b/chrome/browser/chromeos/cros/mount_library.cc
@@ -47,6 +47,8 @@ MountLibrary::Disk::Disk(const std::string& device_path,
mount_path_ = mount_path_.append("/");
}
+MountLibrary::Disk::Disk() {}
+
class MountLibraryImpl : public MountLibrary {
struct UnmountDeviceRecursiveCallbackData {
diff --git a/chrome/browser/chromeos/cros/mount_library.h b/chrome/browser/chromeos/cros/mount_library.h
index 86882db..b735d3d 100644
--- a/chrome/browser/chromeos/cros/mount_library.h
+++ b/chrome/browser/chromeos/cros/mount_library.h
@@ -48,6 +48,8 @@ class MountLibrary {
bool is_read_only,
bool has_media,
bool on_boot_device);
+ ~Disk();
+
// The path of the device, used by devicekit-disks.
const std::string& device_path() const { return device_path_; }
// The path to the mount point of this device. Will be empty if not mounted.
diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc
index 78e728a..9688370 100644
--- a/chrome/browser/chromeos/customization_document.cc
+++ b/chrome/browser/chromeos/customization_document.cc
@@ -155,6 +155,8 @@ StartupCustomizationDocument::StartupCustomizationDocument(
Init(system_access);
}
+StartupCustomizationDocument::~StartupCustomizationDocument() {}
+
StartupCustomizationDocument* StartupCustomizationDocument::GetInstance() {
return Singleton<StartupCustomizationDocument,
DefaultSingletonTraits<StartupCustomizationDocument> >::get();
@@ -260,6 +262,8 @@ ServicesCustomizationDocument::ServicesCustomizationDocument(
LoadManifestFromString(manifest);
}
+ServicesCustomizationDocument::~ServicesCustomizationDocument() {}
+
// static
ServicesCustomizationDocument* ServicesCustomizationDocument::GetInstance() {
return Singleton<ServicesCustomizationDocument,
diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h
index 2da84de..0e5ba2c 100644
--- a/chrome/browser/chromeos/customization_document.h
+++ b/chrome/browser/chromeos/customization_document.h
@@ -83,6 +83,8 @@ class StartupCustomizationDocument : public CustomizationDocument {
StartupCustomizationDocument(SystemAccess* system_access,
const std::string& manifest);
+ ~StartupCustomizationDocument();
+
void Init(SystemAccess* system_access);
// If |attr| exists in machine stat, assign it to |value|.
@@ -167,6 +169,8 @@ class ServicesCustomizationDocument : public CustomizationDocument,
ServicesCustomizationDocument(const std::string& manifest,
const std::string& initial_locale);
+ ~ServicesCustomizationDocument();
+
// Save applied state in machine settings.
static void SetApplied(bool val);
diff --git a/chrome/browser/chromeos/enterprise_extension_observer.h b/chrome/browser/chromeos/enterprise_extension_observer.h
index 4299dbb..014cf22 100644
--- a/chrome/browser/chromeos/enterprise_extension_observer.h
+++ b/chrome/browser/chromeos/enterprise_extension_observer.h
@@ -26,9 +26,9 @@ class EnterpriseExtensionObserver
explicit EnterpriseExtensionObserver(Profile* profile);
virtual ~EnterpriseExtensionObserver() {}
- void Observe(NotificationType type,
- const NotificationSource& source,
- const NotificationDetails& details);
+ virtual void Observe(NotificationType type,
+ const NotificationSource& source,
+ const NotificationDetails& details);
private:
static void CheckExtensionAndNotifyEntd(const FilePath& path);
diff --git a/chrome/browser/chromeos/notifications/balloon_collection_impl.cc b/chrome/browser/chromeos/notifications/balloon_collection_impl.cc
index 8671a50..1e16386 100644
--- a/chrome/browser/chromeos/notifications/balloon_collection_impl.cc
+++ b/chrome/browser/chromeos/notifications/balloon_collection_impl.cc
@@ -133,6 +133,10 @@ void BalloonCollectionImpl::OnBalloonClosed(Balloon* source) {
space_change_listener_->OnBalloonSpaceChanged();
}
+const Balloons& BalloonCollectionImpl::GetActiveBalloons() {
+ return base_.balloons();
+}
+
void BalloonCollectionImpl::Observe(NotificationType type,
const NotificationSource& source,
const NotificationDetails& details) {
diff --git a/chrome/browser/chromeos/notifications/balloon_collection_impl.h b/chrome/browser/chromeos/notifications/balloon_collection_impl.h
index 8254d8f..1f0fbbe 100644
--- a/chrome/browser/chromeos/notifications/balloon_collection_impl.h
+++ b/chrome/browser/chromeos/notifications/balloon_collection_impl.h
@@ -69,7 +69,7 @@ class BalloonCollectionImpl : public BalloonCollection,
virtual void SetPositionPreference(PositionPreference position) {}
virtual void DisplayChanged() {}
virtual void OnBalloonClosed(Balloon* source);
- virtual const Balloons& GetActiveBalloons() { return base_.balloons(); }
+ virtual const Balloons& GetActiveBalloons();
// NotificationObserver overrides:
virtual void Observe(NotificationType type,