chrome/browser/ui/views/collected_cookies_views.cc - Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name

Side by Side Diff: chrome/browser/ui/views/collected_cookies_views.cc

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix cookies_list.js Created 6 years, 5 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 | Annotate | Revision Log

« chrome/browser/resources/options/cookies_list.js ('K') | « chrome/browser/resources/options/cookies_list.js ('k') | chrome/browser/ui/website_settings/website_settings.cc » ('j') | net/socket_stream/socket_stream.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #include "chrome/browser/ui/views/collected_cookies_views.h"	5 #include "chrome/browser/ui/views/collected_cookies_views.h"

6	6

7 #include "base/prefs/pref_service.h"	7 #include "base/prefs/pref_service.h"

8 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"	8 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"

	9 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"

9 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"	10 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"

10 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"	11 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"

11 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"	12 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"

12 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"	13 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"

13 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"	14 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"

14 #include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"

15 #include "chrome/browser/browsing_data/cookies_tree_model.h"	15 #include "chrome/browser/browsing_data/cookies_tree_model.h"

16 #include "chrome/browser/chrome_notification_types.h"	16 #include "chrome/browser/chrome_notification_types.h"

17 #include "chrome/browser/content_settings/cookie_settings.h"	17 #include "chrome/browser/content_settings/cookie_settings.h"

18 #include "chrome/browser/content_settings/local_shared_objects_container.h"	18 #include "chrome/browser/content_settings/local_shared_objects_container.h"

19 #include "chrome/browser/content_settings/tab_specific_content_settings.h"	19 #include "chrome/browser/content_settings/tab_specific_content_settings.h"

20 #include "chrome/browser/infobars/infobar_service.h"	20 #include "chrome/browser/infobars/infobar_service.h"

21 #include "chrome/browser/profiles/profile.h"	21 #include "chrome/browser/profiles/profile.h"

22 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"	22 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"

23 #include "chrome/browser/ui/views/constrained_window_views.h"	23 #include "chrome/browser/ui/views/constrained_window_views.h"

24 #include "chrome/browser/ui/views/cookie_info_view.h"	24 #include "chrome/browser/ui/views/cookie_info_view.h"

(...skipping 510 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
535 ///////////////////////////////////////////////////////////////////////////////	535 ///////////////////////////////////////////////////////////////////////////////

536 // CollectedCookiesViews, content::NotificationObserver implementation:	536 // CollectedCookiesViews, content::NotificationObserver implementation:

537	537

538 void CollectedCookiesViews::Observe(	538 void CollectedCookiesViews::Observe(

539 int type,	539 int type,

540 const content::NotificationSource& source,	540 const content::NotificationSource& source,

541 const content::NotificationDetails& details) {	541 const content::NotificationDetails& details) {

542 DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type);	542 DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type);

543 GetWidget()->Close();	543 GetWidget()->Close();

544 }	544 }

OLD	NEW