Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_image_model.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 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
OLDNEW
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/content_settings/content_setting_image_model.h" 5 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
6 6
7 #include "chrome/browser/content_settings/host_content_settings_map.h" 7 #include "chrome/browser/content_settings/host_content_settings_map.h"
8 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 8 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
9 #include "chrome/browser/prerender/prerender_manager.h" 9 #include "chrome/browser/prerender/prerender_manager.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/tab_contents/tab_contents.h" 11 #include "chrome/browser/ui/tab_contents/tab_contents.h"
12 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 #include "grit/theme_resources.h" 14 #include "grit/theme_resources.h"
15 #include "grit/theme_resources_standard.h"
16 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
17 16
18 using content::WebContents; 17 using content::WebContents;
19 18
20 class ContentSettingBlockedImageModel : public ContentSettingImageModel { 19 class ContentSettingBlockedImageModel : public ContentSettingImageModel {
21 public: 20 public:
22 explicit ContentSettingBlockedImageModel( 21 explicit ContentSettingBlockedImageModel(
23 ContentSettingsType content_settings_type); 22 ContentSettingsType content_settings_type);
24 23
25 virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE; 24 virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE;
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 ContentSettingsType content_settings_type) { 179 ContentSettingsType content_settings_type) {
181 switch (content_settings_type) { 180 switch (content_settings_type) {
182 case CONTENT_SETTINGS_TYPE_GEOLOCATION: 181 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
183 return new ContentSettingGeolocationImageModel(); 182 return new ContentSettingGeolocationImageModel();
184 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: 183 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
185 return new ContentSettingNotificationsImageModel(); 184 return new ContentSettingNotificationsImageModel();
186 default: 185 default:
187 return new ContentSettingBlockedImageModel(content_settings_type); 186 return new ContentSettingBlockedImageModel(content_settings_type);
188 } 187 }
189 } 188 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/collected_cookies_infobar_delegate.cc ('k') | chrome/browser/ui/global_error/global_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698