chrome/browser/ui/gtk/content_setting_bubble_gtk.cc - Issue 6854035: Move blocked content from TabContents to TabContentsWrapper.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/gtk/content_setting_bubble_gtk.cc

Issue 6854035: Move blocked content from TabContents to TabContentsWrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: put back user_gesture Created 9 years, 8 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/ui/blocked_content/blocked_content_tab_helper.cc ('K') | « chrome/browser/ui/gtk/collected_cookies_gtk.h ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

6	6

7 #include <set>	7 #include <set>

8 #include <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10	10

11 #include "base/i18n/rtl.h"	11 #include "base/i18n/rtl.h"

12 #include "base/utf_string_conversions.h"	12 #include "base/utf_string_conversions.h"

13 #include "chrome/browser/blocked_content_container.h"

14 #include "chrome/browser/content_setting_bubble_model.h"

15 #include "chrome/browser/content_settings/host_content_settings_map.h"	13 #include "chrome/browser/content_settings/host_content_settings_map.h"

16 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

	15 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"

17 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"	16 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"

18 #include "chrome/browser/ui/gtk/gtk_theme_service.h"	17 #include "chrome/browser/ui/gtk/gtk_theme_service.h"

19 #include "chrome/browser/ui/gtk/gtk_util.h"	18 #include "chrome/browser/ui/gtk/gtk_util.h"

20 #include "chrome/common/content_settings.h"	19 #include "chrome/common/content_settings.h"

21 #include "content/browser/tab_contents/tab_contents.h"	20 #include "content/browser/tab_contents/tab_contents.h"

22 #include "content/common/notification_source.h"	21 #include "content/common/notification_source.h"

23 #include "content/common/notification_type.h"	22 #include "content/common/notification_type.h"

24 #include "grit/app_resources.h"	23 #include "grit/app_resources.h"

25 #include "grit/generated_resources.h"	24 #include "grit/generated_resources.h"

26 #include "ui/base/l10n/l10n_util.h"	25 #include "ui/base/l10n/l10n_util.h"

(...skipping 279 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
306	305

307 void ContentSettingBubbleGtk::OnCustomLinkClicked(GtkWidget* button) {	306 void ContentSettingBubbleGtk::OnCustomLinkClicked(GtkWidget* button) {

308 content_setting_bubble_model_->OnCustomLinkClicked();	307 content_setting_bubble_model_->OnCustomLinkClicked();

309 Close();	308 Close();

310 }	309 }

311	310

312 void ContentSettingBubbleGtk::OnManageLinkClicked(GtkWidget* button) {	311 void ContentSettingBubbleGtk::OnManageLinkClicked(GtkWidget* button) {

313 content_setting_bubble_model_->OnManageLinkClicked();	312 content_setting_bubble_model_->OnManageLinkClicked();

314 Close();	313 Close();

315 }	314 }

OLD	NEW