diff options
-rw-r--r-- | base/file_path.cc | 17 | ||||
-rw-r--r-- | base/file_path.h | 13 | ||||
-rw-r--r-- | base/weak_ptr.cc | 6 | ||||
-rw-r--r-- | base/weak_ptr.h | 2 | ||||
-rw-r--r-- | chrome/browser/tab_contents/tab_contents_delegate.cc | 4 | ||||
-rw-r--r-- | chrome/browser/tab_contents/tab_contents_delegate.h | 2 | ||||
-rw-r--r-- | chrome/chrome_common.gypi | 2 | ||||
-rw-r--r-- | chrome/common/notification_details.cc | 18 | ||||
-rw-r--r-- | chrome/common/notification_details.h | 8 | ||||
-rw-r--r-- | chrome/common/notification_observer.h | 1 | ||||
-rw-r--r-- | chrome/common/notification_service.cc | 2 | ||||
-rw-r--r-- | chrome/common/notification_source.cc | 17 | ||||
-rw-r--r-- | chrome/common/notification_source.h | 6 | ||||
-rw-r--r-- | webkit/glue/plugins/pepper_url_response_info.h | 2 |
14 files changed, 84 insertions, 16 deletions
diff --git a/base/file_path.cc b/base/file_path.cc index 0706a08..1787a69 100644 --- a/base/file_path.cc +++ b/base/file_path.cc @@ -109,6 +109,23 @@ bool AreAllSeparators(const FilePath::StringType& input) { } // namespace +FilePath::FilePath() { +} + +FilePath::FilePath(const FilePath& that) : path_(that.path_) { +} + +FilePath::FilePath(const StringType& path) : path_(path) { +} + +FilePath::~FilePath() { +} + +FilePath& FilePath::operator=(const FilePath& that) { + path_ = that.path_; + return *this; +} + bool FilePath::IsSeparator(CharType character) { for (size_t i = 0; i < arraysize(kSeparators) - 1; ++i) { if (character == kSeparators[i]) { diff --git a/base/file_path.h b/base/file_path.h index 46a3060..6484c5a 100644 --- a/base/file_path.h +++ b/base/file_path.h @@ -150,14 +150,11 @@ class FilePath { // The character used to identify a file extension. static const CharType kExtensionSeparator; - FilePath() {} - FilePath(const FilePath& that) : path_(that.path_) {} - explicit FilePath(const StringType& path) : path_(path) {} - - FilePath& operator=(const FilePath& that) { - path_ = that.path_; - return *this; - } + FilePath(); + FilePath(const FilePath& that); + explicit FilePath(const StringType& path); + ~FilePath(); + FilePath& operator=(const FilePath& that); bool operator==(const FilePath& that) const; diff --git a/base/weak_ptr.cc b/base/weak_ptr.cc index 2c8f5aa..dec6a65 100644 --- a/base/weak_ptr.cc +++ b/base/weak_ptr.cc @@ -31,6 +31,9 @@ WeakReference::WeakReference() { WeakReference::WeakReference(Flag* flag) : flag_(flag) { } +WeakReference::~WeakReference() { +} + bool WeakReference::is_valid() const { return flag_ && flag_->is_valid(); } @@ -61,5 +64,8 @@ WeakPtrBase::WeakPtrBase() { WeakPtrBase::WeakPtrBase(const WeakReference& ref) : ref_(ref) { } +WeakPtrBase::~WeakPtrBase() { +} + } // namespace internal } // namespace base diff --git a/base/weak_ptr.h b/base/weak_ptr.h index 85a26d16..6dbc9e2 100644 --- a/base/weak_ptr.h +++ b/base/weak_ptr.h @@ -79,6 +79,7 @@ class WeakReference { WeakReference(); WeakReference(Flag* flag); + ~WeakReference(); bool is_valid() const; @@ -110,6 +111,7 @@ class WeakReferenceOwner { class WeakPtrBase { public: WeakPtrBase(); + ~WeakPtrBase(); protected: WeakPtrBase(const WeakReference& ref); diff --git a/chrome/browser/tab_contents/tab_contents_delegate.cc b/chrome/browser/tab_contents/tab_contents_delegate.cc index 539c221..c200f3c 100644 --- a/chrome/browser/tab_contents/tab_contents_delegate.cc +++ b/chrome/browser/tab_contents/tab_contents_delegate.cc @@ -121,6 +121,10 @@ void TabContentsDelegate::ShowContentSettingsWindow( ContentSettingsType content_type) { } +void TabContentsDelegate::ShowCollectedCookiesDialog( + TabContents* tab_contents) { +} + bool TabContentsDelegate::OnGoToEntryOffset(int offset) { return true; } diff --git a/chrome/browser/tab_contents/tab_contents_delegate.h b/chrome/browser/tab_contents/tab_contents_delegate.h index 873dbe1..4dd8e1a 100644 --- a/chrome/browser/tab_contents/tab_contents_delegate.h +++ b/chrome/browser/tab_contents/tab_contents_delegate.h @@ -238,7 +238,7 @@ class TabContentsDelegate : public AutomationResourceRoutingDelegate { virtual void ShowContentSettingsWindow(ContentSettingsType content_type); // Shows the cookies collected in the tab contents. - virtual void ShowCollectedCookiesDialog(TabContents* tab_contents) {} + virtual void ShowCollectedCookiesDialog(TabContents* tab_contents); // Allows delegate to override navigation to the history entries. // Returns true to allow TabContents to continue with the default processing. diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 6978ebe..db1db8b 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -73,12 +73,14 @@ 'common/nacl_messages.h', 'common/nacl_types.h', 'common/nacl_messages_internal.h', + 'common/notification_details.cc', 'common/notification_details.h', 'common/notification_observer.h', 'common/notification_registrar.cc', 'common/notification_registrar.h', 'common/notification_service.cc', 'common/notification_service.h', + 'common/notification_source.cc', 'common/notification_source.h', 'common/notification_type.h', 'common/plugin_group.cc', diff --git a/chrome/common/notification_details.cc b/chrome/common/notification_details.cc new file mode 100644 index 0000000..4455faa --- /dev/null +++ b/chrome/common/notification_details.cc @@ -0,0 +1,18 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/common/notification_details.h" + +NotificationDetails::NotificationDetails() : ptr_(NULL) { +} + +NotificationDetails::NotificationDetails(const NotificationDetails& other) + : ptr_(other.ptr_) { +} + +NotificationDetails::NotificationDetails(const void* ptr) : ptr_(ptr) { +} + +NotificationDetails::~NotificationDetails() { +} diff --git a/chrome/common/notification_details.h b/chrome/common/notification_details.h index 2c914d7..92c1906 100644 --- a/chrome/common/notification_details.h +++ b/chrome/common/notification_details.h @@ -15,9 +15,9 @@ // NotificationService::NoDetails(). class NotificationDetails { public: - NotificationDetails() : ptr_(NULL) {} - NotificationDetails(const NotificationDetails& other) : ptr_(other.ptr_) {} - ~NotificationDetails() {} + NotificationDetails(); + NotificationDetails(const NotificationDetails& other); + ~NotificationDetails(); // NotificationDetails can be used as the index for a map; this method // returns the pointer to the current details as an identifier, for use as a @@ -33,7 +33,7 @@ class NotificationDetails { } protected: - explicit NotificationDetails(const void* ptr) : ptr_(ptr) {} + explicit NotificationDetails(const void* ptr); // Declaring this const allows Details<T> to be used with both T = Foo and // T = const Foo. diff --git a/chrome/common/notification_observer.h b/chrome/common/notification_observer.h index b8c9842..8ad4d4a 100644 --- a/chrome/common/notification_observer.h +++ b/chrome/common/notification_observer.h @@ -13,6 +13,7 @@ class NotificationType; // notification is posted to the notification service, Observe is called. class NotificationObserver { public: + NotificationObserver(); virtual ~NotificationObserver(); virtual void Observe(NotificationType type, diff --git a/chrome/common/notification_service.cc b/chrome/common/notification_service.cc index 5d6378f..e127ccf 100644 --- a/chrome/common/notification_service.cc +++ b/chrome/common/notification_service.cc @@ -147,4 +147,6 @@ NotificationService::~NotificationService() { } } +NotificationObserver::NotificationObserver() {} + NotificationObserver::~NotificationObserver() {} diff --git a/chrome/common/notification_source.cc b/chrome/common/notification_source.cc new file mode 100644 index 0000000..e0f5ca0 --- /dev/null +++ b/chrome/common/notification_source.cc @@ -0,0 +1,17 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/common/notification_source.h" + +NotificationSource::NotificationSource(const NotificationSource& other) + : ptr_(other.ptr_) { +} + +NotificationSource::NotificationSource(const void* ptr) : ptr_(ptr) { +} + +NotificationSource::~NotificationSource() { +} + + diff --git a/chrome/common/notification_source.h b/chrome/common/notification_source.h index 98b9f66..1813c2e 100644 --- a/chrome/common/notification_source.h +++ b/chrome/common/notification_source.h @@ -15,8 +15,8 @@ // NotificationService::AllSources(). class NotificationSource { public: - NotificationSource(const NotificationSource& other) : ptr_(other.ptr_) { } - ~NotificationSource() {} + NotificationSource(const NotificationSource& other); + ~NotificationSource(); // NotificationSource can be used as the index for a map; this method // returns the pointer to the current source as an identifier, for use as a @@ -31,7 +31,7 @@ class NotificationSource { } protected: - explicit NotificationSource(const void* ptr) : ptr_(ptr) {} + explicit NotificationSource(const void* ptr); // Declaring this const allows Source<T> to be used with both T = Foo and // T = const Foo. diff --git a/webkit/glue/plugins/pepper_url_response_info.h b/webkit/glue/plugins/pepper_url_response_info.h index f4fe5a4..cc931d6 100644 --- a/webkit/glue/plugins/pepper_url_response_info.h +++ b/webkit/glue/plugins/pepper_url_response_info.h @@ -5,6 +5,8 @@ #ifndef WEBKIT_GLUE_PLUGINS_PEPPER_URL_RESPONSE_INFO_H_ #define WEBKIT_GLUE_PLUGINS_PEPPER_URL_RESPONSE_INFO_H_ +#include <string> + #include "third_party/ppapi/c/ppb_url_response_info.h" #include "webkit/glue/plugins/pepper_resource.h" |