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

Unified Diff: chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.mm

Issue 2797923003: Rename PageInfoPopupView to PageInfoBubbleView. (Closed)
Patch Set: Rename more stuff. 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.mm b/chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.mm
index 9c68f3f8ecfc2b208c42c3663275c8ce3be787fc..57f27b4344208fcdff3e9e4cf6a6620009896a62 100644
--- a/chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.mm
@@ -112,9 +112,9 @@ 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;
+// bubbl shown, and that the one that is shown is associated with the current
msw 2017/04/05 19:27:20 nit: bubble
+// 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
@@ -1123,13 +1123,13 @@ 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(
@@ -1152,14 +1152,14 @@ void PageInfoUIBridge::Show(gfx::NativeWindow parent,
// Don't show the popup if it's already being shown. Since this method is
msw 2017/04/05 19:27:20 nit: s/popup/bubble/
// called each time the location icon is clicked, each click toggles the popup
msw 2017/04/05 19:27:20 nit: s/popup/bubble/
// in and out.
- if (g_is_popup_showing)
+ 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

Powered by Google App Engine
This is Rietveld 408576698