Rename PageInfoPopupView to PageInfoBubbleView.

chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.h"
 
 #import <AppKit/AppKit.h>
 
 #include <cmath>
 
@@ skipping 97 matching lines @@
 
 // Padding between the window frame and content for the internal page bubble.
 const CGFloat kInternalPageFramePadding = 10;
 
 // Spacing between the image and text for internal pages.
 const CGFloat kInternalPageImageSpacing = 10;
 
 // -----------------------------------------------------------------------------
 
 // NOTE: This assumes that there will never be more than one page info
-// popup shown, and that the one that is shown is associated with the current
-// window. This matches the behaviour in views: see PageInfoPopupView.
-bool g_is_popup_showing = false;
+// bubble shown, and that the one that is shown is associated with the current
+// window. This matches the behaviour in Views: see PageInfoBubbleView.
+bool g_is_bubble_showing = false;
 
 // Takes in the parent window, which should be a BrowserWindow, and gets the
 // proper anchor point for the bubble. The returned point is in screen
 // coordinates.
 NSPoint AnchorPointForWindow(NSWindow* parent) {
   BrowserWindowController* controller = [parent windowController];
   NSPoint origin = NSZeroPoint;
   if ([controller isKindOfClass:[BrowserWindowController class]]) {
     LocationBarViewMac* location_bar = [controller locationBarBridge];
     if (location_bar) {
@@ skipping 1007 matching lines @@
                                             controlOrigin.y)];
   [self performLayout];
 }
 
 @end
 
 PageInfoUIBridge::PageInfoUIBridge(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       web_contents_(web_contents),
       bubble_controller_(nil) {
-  DCHECK(!g_is_popup_showing);
-  g_is_popup_showing = true;
+  DCHECK(!g_is_bubble_showing);
+  g_is_bubble_showing = true;
 }
 
 PageInfoUIBridge::~PageInfoUIBridge() {
-  DCHECK(g_is_popup_showing);
-  g_is_popup_showing = false;
+  DCHECK(g_is_bubble_showing);
+  g_is_bubble_showing = false;
 }
 
 void PageInfoUIBridge::set_bubble_controller(
     PageInfoBubbleController* controller) {
   bubble_controller_ = controller;
 }
 
 void PageInfoUIBridge::Show(gfx::NativeWindow parent,
                             Profile* profile,
                             content::WebContents* web_contents,
                             const GURL& virtual_url,
                             const security_state::SecurityInfo& security_info) {
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     chrome::ShowPageInfoBubbleViewsAtPoint(
         gfx::ScreenPointFromNSPoint(AnchorPointForWindow(parent)), profile,
         web_contents, virtual_url, security_info);
     return;
   }
 
-  // Don't show the popup if it's already being shown. Since this method is
-  // called each time the location icon is clicked, each click toggles the popup
-  // in and out.
-  if (g_is_popup_showing)
+  // Don't show the bubble if it's already being shown. Since this method is
+  // called each time the location icon is clicked, each click toggles the
+  // bubble in and out.
+  if (g_is_bubble_showing)
     return;
 
   // Create the bridge. This will be owned by the bubble controller.
   PageInfoUIBridge* bridge = new PageInfoUIBridge(web_contents);
 
   // Create the bubble controller. It will dealloc itself when it closes,
-  // resetting |g_is_popup_showing|.
+  // resetting |g_is_bubble_showing|.
   PageInfoBubbleController* bubble_controller =
       [[PageInfoBubbleController alloc] initWithParentWindow:parent
                                             pageInfoUIBridge:bridge
                                                  webContents:web_contents
                                                          url:virtual_url];
 
   if (!IsInternalURL(virtual_url)) {
     // Initialize the presenter, which holds the model and controls the UI.
     // This is also owned by the bubble controller.
     PageInfo* presenter =
@@ skipping 21 matching lines @@
 void PageInfoUIBridge::SetCookieInfo(const CookieInfoList& cookie_info_list) {
   [bubble_controller_ setCookieInfo:cookie_info_list];
 }
 
 void PageInfoUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     ChosenObjectInfoList chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:std::move(chosen_object_info_list)];
 }