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

Side by Side Diff: chrome/browser/ui/page_info/page_info.cc

Issue 2797923003: Rename PageInfoPopupView to PageInfoBubbleView. (Closed)
Patch Set: Two more words. Created 3 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
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/page_info/page_info.h" 5 #include "chrome/browser/ui/page_info/page_info.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 "ContentSettings.Plugins.AddedAllowException", site_url_); 329 "ContentSettings.Plugins.AddedAllowException", site_url_);
330 } 330 }
331 } else if (setting == ContentSetting::CONTENT_SETTING_BLOCK) { 331 } else if (setting == ContentSetting::CONTENT_SETTING_BLOCK) {
332 UMA_HISTOGRAM_EXACT_LINEAR( 332 UMA_HISTOGRAM_EXACT_LINEAR(
333 "WebsiteSettings.OriginInfo.PermissionChanged.Blocked", histogram_value, 333 "WebsiteSettings.OriginInfo.PermissionChanged.Blocked", histogram_value,
334 num_values); 334 num_values);
335 } 335 }
336 336
337 // This is technically redundant given the histogram above, but putting the 337 // This is technically redundant given the histogram above, but putting the
338 // total count of permission changes in another histogram makes it easier to 338 // total count of permission changes in another histogram makes it easier to
339 // compare it against other kinds of actions in PageInfo[PopupView]. 339 // compare it against other kinds of actions in Page Info.
340 RecordPageInfoAction(PAGE_INFO_CHANGED_PERMISSION); 340 RecordPageInfoAction(PAGE_INFO_CHANGED_PERMISSION);
341 341
342 PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter( 342 PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter(
343 this->profile_, this->site_url_, this->site_url_, type, 343 this->profile_, this->site_url_, this->site_url_, type,
344 PermissionSourceUI::OIB); 344 PermissionSourceUI::OIB);
345 345
346 content_settings_->SetNarrowestContentSetting(site_url_, site_url_, type, 346 content_settings_->SetNarrowestContentSetting(site_url_, site_url_, type,
347 setting); 347 setting);
348 348
349 show_info_bar_ = true; 349 show_info_bar_ = true;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 DCHECK(chrome_ssl_host_state_delegate_); 394 DCHECK(chrome_ssl_host_state_delegate_);
395 chrome_ssl_host_state_delegate_->RevokeUserAllowExceptionsHard( 395 chrome_ssl_host_state_delegate_->RevokeUserAllowExceptionsHard(
396 site_url().host()); 396 site_url().host());
397 did_revoke_user_ssl_decisions_ = true; 397 did_revoke_user_ssl_decisions_ = true;
398 } 398 }
399 399
400 void PageInfo::Init(const GURL& url, 400 void PageInfo::Init(const GURL& url,
401 const security_state::SecurityInfo& security_info) { 401 const security_state::SecurityInfo& security_info) {
402 #if !defined(OS_ANDROID) && !defined(OS_IOS) 402 #if !defined(OS_ANDROID) && !defined(OS_IOS)
403 // On desktop, internal URLs aren't handled by this class. Instead, a 403 // On desktop, internal URLs aren't handled by this class. Instead, a
404 // custom and simpler popup is shown. 404 // custom and simpler bubble is shown.
405 DCHECK(!url.SchemeIs(content::kChromeUIScheme) && 405 DCHECK(!url.SchemeIs(content::kChromeUIScheme) &&
406 !url.SchemeIs(content::kChromeDevToolsScheme) && 406 !url.SchemeIs(content::kChromeDevToolsScheme) &&
407 !url.SchemeIs(content::kViewSourceScheme) && 407 !url.SchemeIs(content::kViewSourceScheme) &&
408 !url.SchemeIs(content_settings::kExtensionScheme)); 408 !url.SchemeIs(content_settings::kExtensionScheme));
409 #endif 409 #endif
410 410
411 bool isChromeUINativeScheme = false; 411 bool isChromeUINativeScheme = false;
412 #if defined(OS_ANDROID) 412 #if defined(OS_ANDROID)
413 isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme); 413 isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme);
414 #endif 414 #endif
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 info.site_identity = UTF16ToUTF8(GetSimpleSiteName(site_url_)); 763 info.site_identity = UTF16ToUTF8(GetSimpleSiteName(site_url_));
764 764
765 info.connection_status = site_connection_status_; 765 info.connection_status = site_connection_status_;
766 info.connection_status_description = UTF16ToUTF8(site_connection_details_); 766 info.connection_status_description = UTF16ToUTF8(site_connection_details_);
767 info.identity_status = site_identity_status_; 767 info.identity_status = site_identity_status_;
768 info.identity_status_description = UTF16ToUTF8(site_identity_details_); 768 info.identity_status_description = UTF16ToUTF8(site_identity_details_);
769 info.certificate = certificate_; 769 info.certificate = certificate_;
770 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 770 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
771 ui_->SetIdentityInfo(info); 771 ui_->SetIdentityInfo(info);
772 } 772 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.mm ('k') | chrome/browser/ui/page_info/page_info_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698