chrome/browser/ui/content_settings/content_setting_image_model.h - 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_image_model.h

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.cc ('k') | chrome/browser/ui/content_settings/content_setting_image_model.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) 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 #ifndef CHROME_BROWSER_CONTENT_SETTING_IMAGE_MODEL_H_	5 #ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_

6 #define CHROME_BROWSER_CONTENT_SETTING_IMAGE_MODEL_H_	6 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_

7 #pragma once	7 #pragma once

8	8

9 #include <string>	9 #include <string>

10	10

11 #include "chrome/common/content_settings_types.h"	11 #include "chrome/common/content_settings_types.h"

12	12

13 class TabContents;	13 class TabContents;

14	14

15 // This model provides data (icon ids and tooltip) for the content setting icons	15 // This model provides data (icon ids and tooltip) for the content setting icons

16 // that are displayed in the location bar.	16 // that are displayed in the location bar.

(...skipping 29 matching lines...) Expand all Loading...
46 void set_tooltip(const std::string& tooltip) { tooltip_ = tooltip; }	46 void set_tooltip(const std::string& tooltip) { tooltip_ = tooltip; }

47	47

48 private:	48 private:

49 const ContentSettingsType content_settings_type_;	49 const ContentSettingsType content_settings_type_;

50 bool is_visible_;	50 bool is_visible_;

51 int icon_;	51 int icon_;

52 int explanatory_string_id_;	52 int explanatory_string_id_;

53 std::string tooltip_;	53 std::string tooltip_;

54 };	54 };

55	55

56 #endif // CHROME_BROWSER_CONTENT_SETTING_IMAGE_MODEL_H_	56 #endif // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_IMAGE_MODEL_H_

OLD	NEW