chrome/browser/ui/content_settings/content_setting_combo_model.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/content_settings/content_setting_combo_model.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/content_settings/content_setting_combo_model.h ('k') | chrome/browser/ui/content_settings/content_setting_image_model.h » ('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) 2010 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/content_setting_combo_model.h"	5 #include "chrome/browser/ui/content_settings/content_setting_combo_model.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/string16.h"	8 #include "base/string16.h"

9 #include "chrome/common/chrome_switches.h"	9 #include "chrome/common/chrome_switches.h"

10 #include "grit/generated_resources.h"	10 #include "grit/generated_resources.h"

11 #include "ui/base/l10n/l10n_util.h"	11 #include "ui/base/l10n/l10n_util.h"

12	12

13 namespace {	13 namespace {

14	14

15 // The settings shown in the combobox if show_session_ is false;	15 // The settings shown in the combobox if show_session_ is false;

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69 return kNoSessionSettings[index];	69 return kNoSessionSettings[index];

70 }	70 }

71	71

72 int ContentSettingComboModel::IndexForSetting(ContentSetting setting) {	72 int ContentSettingComboModel::IndexForSetting(ContentSetting setting) {

73 for (int i = 0; i < GetItemCount(); ++i)	73 for (int i = 0; i < GetItemCount(); ++i)

74 if (SettingForIndex(i) == setting)	74 if (SettingForIndex(i) == setting)

75 return i;	75 return i;

76 NOTREACHED();	76 NOTREACHED();

77 return 0;	77 return 0;

78 }	78 }

79

OLD	NEW