diff options
6 files changed, 17 insertions, 17 deletions
diff --git a/chrome/browser/content_settings/content_settings_mock_observer.h b/chrome/browser/content_settings/content_settings_mock_observer.h index 0c86604..419fcd7 100644 --- a/chrome/browser/content_settings/content_settings_mock_observer.h +++ b/chrome/browser/content_settings/content_settings_mock_observer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -18,8 +18,8 @@ class MockObserver : public Observer { virtual ~MockObserver(); MOCK_METHOD4(OnContentSettingChanged, - void(ContentSettingsPattern primary_pattern, - ContentSettingsPattern secondary_pattern, + void(const ContentSettingsPattern& primary_pattern, + const ContentSettingsPattern& secondary_pattern, ContentSettingsType content_type, std::string resource_identifier)); private: diff --git a/chrome/browser/content_settings/content_settings_observable_provider.cc b/chrome/browser/content_settings/content_settings_observable_provider.cc index 98f91cb..a175e74 100644 --- a/chrome/browser/content_settings/content_settings_observable_provider.cc +++ b/chrome/browser/content_settings/content_settings_observable_provider.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -29,8 +29,8 @@ void ObservableProvider::RemoveAllObservers() { } void ObservableProvider::NotifyObservers( - ContentSettingsPattern primary_pattern, - ContentSettingsPattern secondary_pattern, + const ContentSettingsPattern& primary_pattern, + const ContentSettingsPattern& secondary_pattern, ContentSettingsType content_type, std::string resource_identifier) { FOR_EACH_OBSERVER(Observer, diff --git a/chrome/browser/content_settings/content_settings_observable_provider.h b/chrome/browser/content_settings/content_settings_observable_provider.h index 28d8ecd..1731e0c 100644 --- a/chrome/browser/content_settings/content_settings_observable_provider.h +++ b/chrome/browser/content_settings/content_settings_observable_provider.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -23,8 +23,8 @@ class ObservableProvider : public ProviderInterface { void RemoveObserver(Observer* observer); protected: - void NotifyObservers(ContentSettingsPattern primary_pattern, - ContentSettingsPattern secondary_pattern, + void NotifyObservers(const ContentSettingsPattern& primary_pattern, + const ContentSettingsPattern& secondary_pattern, ContentSettingsType content_type, std::string resource_identifier); void RemoveAllObservers(); diff --git a/chrome/browser/content_settings/content_settings_observer.h b/chrome/browser/content_settings/content_settings_observer.h index e26fa27..a72771b 100644 --- a/chrome/browser/content_settings/content_settings_observer.h +++ b/chrome/browser/content_settings/content_settings_observer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -15,8 +15,8 @@ namespace content_settings { class Observer { public: virtual void OnContentSettingChanged( - ContentSettingsPattern primary_pattern, - ContentSettingsPattern secondary_pattern, + const ContentSettingsPattern& primary_pattern, + const ContentSettingsPattern& secondary_pattern, ContentSettingsType content_type, std::string resource_identifier) = 0; }; diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc index 7a00e90..7351219 100644 --- a/chrome/browser/content_settings/host_content_settings_map.cc +++ b/chrome/browser/content_settings/host_content_settings_map.cc @@ -341,8 +341,8 @@ bool HostContentSettingsMap::IsSettingAllowedForType( } void HostContentSettingsMap::OnContentSettingChanged( - ContentSettingsPattern primary_pattern, - ContentSettingsPattern secondary_pattern, + const ContentSettingsPattern& primary_pattern, + const ContentSettingsPattern& secondary_pattern, ContentSettingsType content_type, std::string resource_identifier) { const ContentSettingsDetails details(primary_pattern, diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h index e02c751..99be43f 100644 --- a/chrome/browser/content_settings/host_content_settings_map.h +++ b/chrome/browser/content_settings/host_content_settings_map.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -166,8 +166,8 @@ class HostContentSettingsMap // content_settings::Observer implementation. virtual void OnContentSettingChanged( - ContentSettingsPattern primary_pattern, - ContentSettingsPattern secondary_pattern, + const ContentSettingsPattern& primary_pattern, + const ContentSettingsPattern& secondary_pattern, ContentSettingsType content_type, std::string resource_identifier) OVERRIDE; |