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

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

Issue 1575623002: Disable Web Notifications in Incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permfix
Patch Set: No Profile* in WebsiteSettingsPopupView Created 4 years, 11 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 "base/macros.h" 7 #include "base/macros.h"
8 #include "chrome/grit/chromium_strings.h" 8 #include "chrome/grit/chromium_strings.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "components/content_settings/core/browser/plugins_field_trial.h" 10 #include "components/content_settings/core/browser/plugins_field_trial.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 } // namespace 115 } // namespace
116 116
117 WebsiteSettingsUI::CookieInfo::CookieInfo() 117 WebsiteSettingsUI::CookieInfo::CookieInfo()
118 : allowed(-1), blocked(-1) { 118 : allowed(-1), blocked(-1) {
119 } 119 }
120 120
121 WebsiteSettingsUI::PermissionInfo::PermissionInfo() 121 WebsiteSettingsUI::PermissionInfo::PermissionInfo()
122 : type(CONTENT_SETTINGS_TYPE_DEFAULT), 122 : type(CONTENT_SETTINGS_TYPE_DEFAULT),
123 setting(CONTENT_SETTING_DEFAULT), 123 setting(CONTENT_SETTING_DEFAULT),
124 default_setting(CONTENT_SETTING_DEFAULT), 124 default_setting(CONTENT_SETTING_DEFAULT),
125 source(content_settings::SETTING_SOURCE_NONE) { 125 source(content_settings::SETTING_SOURCE_NONE),
126 } 126 is_incognito(false) {}
127 127
128 WebsiteSettingsUI::ChosenObjectInfo::ChosenObjectInfo( 128 WebsiteSettingsUI::ChosenObjectInfo::ChosenObjectInfo(
129 const WebsiteSettings::ChooserUIInfo& ui_info, 129 const WebsiteSettings::ChooserUIInfo& ui_info,
130 scoped_ptr<base::DictionaryValue> object) 130 scoped_ptr<base::DictionaryValue> object)
131 : ui_info(ui_info), object(std::move(object)) {} 131 : ui_info(ui_info), object(std::move(object)) {}
132 132
133 WebsiteSettingsUI::ChosenObjectInfo::~ChosenObjectInfo() {} 133 WebsiteSettingsUI::ChosenObjectInfo::~ChosenObjectInfo() {}
134 134
135 WebsiteSettingsUI::IdentityInfo::IdentityInfo() 135 WebsiteSettingsUI::IdentityInfo::IdentityInfo()
136 : identity_status(WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN), 136 : identity_status(WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN),
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 } 359 }
360 return resource_id; 360 return resource_id;
361 } 361 }
362 362
363 // static 363 // static
364 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon( 364 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
365 WebsiteSettings::SiteConnectionStatus status) { 365 WebsiteSettings::SiteConnectionStatus status) {
366 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 366 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
367 return rb.GetNativeImageNamed(GetConnectionIconID(status)); 367 return rb.GetNativeImageNamed(GetConnectionIconID(status));
368 } 368 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698