summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhans <hans@chromium.org>2015-08-25 12:41:26 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-25 19:42:36 +0000
commit6588c58e003f55537629931eb3547e137eb26cad (patch)
treeeb12a1afc59e528987683ecb9fb3a1b4dc6891f9
parent04a90d0bf18383d07f6bbc2bc02376b14a35596b (diff)
downloadchromium_src-6588c58e003f55537629931eb3547e137eb26cad.zip
chromium_src-6588c58e003f55537629931eb3547e137eb26cad.tar.gz
chromium_src-6588c58e003f55537629931eb3547e137eb26cad.tar.bz2
Remove Win-Clang in-class initializer work-arounds
BUG=488634 TBR=ncarter, jkarlin Review URL: https://codereview.chromium.org/1313973002 Cr-Commit-Position: refs/heads/master@{#345410}
-rw-r--r--content/browser/background_sync/background_sync_registration.cc3
-rw-r--r--content/browser/background_sync/background_sync_registration.h1
-rw-r--r--content/browser/background_sync/background_sync_registration_options.cc4
-rw-r--r--content/browser/background_sync/background_sync_registration_options.h1
-rw-r--r--content/public/browser/desktop_media_id.cc2
-rw-r--r--content/public/browser/desktop_media_id.h3
6 files changed, 1 insertions, 13 deletions
diff --git a/content/browser/background_sync/background_sync_registration.cc b/content/browser/background_sync/background_sync_registration.cc
index 427580a..29745d7 100644
--- a/content/browser/background_sync/background_sync_registration.cc
+++ b/content/browser/background_sync/background_sync_registration.cc
@@ -78,9 +78,6 @@ TypeConverter<content::SyncRegistrationPtr,
namespace content {
-// TODO(thakis): Remove this once http://crbug.com/488634 is fixed.
-BackgroundSyncRegistration::BackgroundSyncRegistration() = default;
-
const BackgroundSyncRegistration::RegistrationId
BackgroundSyncRegistration::kInvalidRegistrationId = -1;
diff --git a/content/browser/background_sync/background_sync_registration.h b/content/browser/background_sync/background_sync_registration.h
index 94d7648..e965329 100644
--- a/content/browser/background_sync/background_sync_registration.h
+++ b/content/browser/background_sync/background_sync_registration.h
@@ -19,7 +19,6 @@ class CONTENT_EXPORT BackgroundSyncRegistration {
using RegistrationId = int64_t;
static const RegistrationId kInitialId;
- BackgroundSyncRegistration();
bool Equals(const BackgroundSyncRegistration& other) const;
bool IsValid() const;
diff --git a/content/browser/background_sync/background_sync_registration_options.cc b/content/browser/background_sync/background_sync_registration_options.cc
index dc3d2e1..74b8bac 100644
--- a/content/browser/background_sync/background_sync_registration_options.cc
+++ b/content/browser/background_sync/background_sync_registration_options.cc
@@ -6,10 +6,6 @@
namespace content {
-// TODO(thakis): Remove this once http://crbug.com/488634 is fixed.
-BackgroundSyncRegistrationOptions::BackgroundSyncRegistrationOptions() =
- default;
-
bool BackgroundSyncRegistrationOptions::Equals(
const BackgroundSyncRegistrationOptions& other) const {
return tag == other.tag && min_period == other.min_period &&
diff --git a/content/browser/background_sync/background_sync_registration_options.h b/content/browser/background_sync/background_sync_registration_options.h
index 9dcb8d9..133c9f6 100644
--- a/content/browser/background_sync/background_sync_registration_options.h
+++ b/content/browser/background_sync/background_sync_registration_options.h
@@ -15,7 +15,6 @@ namespace content {
// The options passed to BackgroundSyncManager::Registration.
struct CONTENT_EXPORT BackgroundSyncRegistrationOptions {
- BackgroundSyncRegistrationOptions();
bool Equals(const BackgroundSyncRegistrationOptions& other) const;
std::string tag;
diff --git a/content/public/browser/desktop_media_id.cc b/content/public/browser/desktop_media_id.cc
index 74fbb3a..2d7f6d1 100644
--- a/content/public/browser/desktop_media_id.cc
+++ b/content/public/browser/desktop_media_id.cc
@@ -93,8 +93,6 @@ aura::Window* DesktopMediaID::GetAuraWindowById(const DesktopMediaID& id) {
#endif // defined(USE_AURA)
-DesktopMediaID::DesktopMediaID() = default;
-
// static
DesktopMediaID DesktopMediaID::Parse(const std::string& str) {
std::vector<std::string> parts = base::SplitString(
diff --git a/content/public/browser/desktop_media_id.h b/content/public/browser/desktop_media_id.h
index 657d4db..c31875b 100644
--- a/content/public/browser/desktop_media_id.h
+++ b/content/public/browser/desktop_media_id.h
@@ -44,8 +44,7 @@ struct CONTENT_EXPORT DesktopMediaID {
static DesktopMediaID Parse(const std::string& str);
- // TODO(hans): Maybe move inline again after crbug.com/488634.
- DesktopMediaID();
+ DesktopMediaID() = default;
DesktopMediaID(Type type, Id id)
: type(type),