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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings_ui.cc

Issue 1349843003: Display active mixed content as error instead of info in WebsiteSettings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: check icon id in unit tests also Created 5 years, 3 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
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/website_settings/website_settings_ui.h" 5 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
6 6
7 #include "chrome/grit/chromium_strings.h" 7 #include "chrome/grit/chromium_strings.h"
8 #include "chrome/grit/generated_resources.h" 8 #include "chrome/grit/generated_resources.h"
9 #include "components/content_settings/core/browser/plugins_field_trial.h" 9 #include "components/content_settings/core/browser/plugins_field_trial.h"
10 #include "grit/theme_resources.h" 10 #include "grit/theme_resources.h"
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 break; 344 break;
345 case WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED: 345 case WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED:
346 resource_id = IDR_PAGEINFO_GOOD; 346 resource_id = IDR_PAGEINFO_GOOD;
347 break; 347 break;
348 case WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_CONTENT: 348 case WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_CONTENT:
349 resource_id = IDR_PAGEINFO_WARNING_MINOR; 349 resource_id = IDR_PAGEINFO_WARNING_MINOR;
350 break; 350 break;
351 case WebsiteSettings::SITE_CONNECTION_STATUS_UNENCRYPTED: 351 case WebsiteSettings::SITE_CONNECTION_STATUS_UNENCRYPTED:
352 resource_id = IDR_PAGEINFO_WARNING_MAJOR; 352 resource_id = IDR_PAGEINFO_WARNING_MAJOR;
353 break; 353 break;
354 case WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_SCRIPT:
354 case WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED_ERROR: 355 case WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED_ERROR:
355 resource_id = IDR_PAGEINFO_BAD; 356 resource_id = IDR_PAGEINFO_BAD;
356 break; 357 break;
357 default:
estark 2015/09/16 21:32:08 deleted this case because if it hadn't been here,
felt 2015/09/17 17:18:56 good call. I'm surprised we didn't see any reports
estark 2015/09/17 17:22:19 Huh, that is surprising. Then again, I don't think
358 NOTREACHED();
359 break;
360 } 358 }
361 return resource_id; 359 return resource_id;
362 } 360 }
363 361
364 // static 362 // static
365 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon( 363 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
366 WebsiteSettings::SiteConnectionStatus status) { 364 WebsiteSettings::SiteConnectionStatus status) {
367 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 365 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
368 return rb.GetNativeImageNamed(GetConnectionIconID(status)); 366 return rb.GetNativeImageNamed(GetConnectionIconID(status));
369 } 367 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698