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

Unified Diff: chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h

Issue 1092933006: Revert of Center permission bubble if location bar is hidden in MacOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/website_settings/permission_bubble_cocoa.h
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h b/chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h
index ba876f0b15b88a5755ef0055c1adc0278bd2045b..de6816fcb6d9cca53ab606c0c97e70b30ca9b2be 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h
+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h
@@ -5,11 +5,9 @@
#ifndef CHROME_BROWSER_UI_COCOA_PERMISSION_BUBBLE_COCOA_H_
#define CHROME_BROWSER_UI_COCOA_PERMISSION_BUBBLE_COCOA_H_
-#include "base/gtest_prod_util.h"
#include "base/mac/scoped_nsobject.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/ui/cocoa/info_bubble_view.h"
#include "chrome/browser/ui/website_settings/permission_bubble_view.h"
#include "content/public/browser/web_contents.h"
@@ -45,23 +43,12 @@
// Change the parent window to be used the next time the bubble is shown.
void SwitchParentWindow(NSWindow* parent);
- info_bubble::BubbleArrowLocation GetArrowLocation();
-
- private:
- FRIEND_TEST_ALL_PREFIXES(PermissionBubbleBrowserTest,
- HasLocationBarByDefault);
- FRIEND_TEST_ALL_PREFIXES(PermissionBubbleBrowserTest,
- FullscreenHasLocationBar);
- FRIEND_TEST_ALL_PREFIXES(PermissionBubbleAppBrowserTest, AppHasNoLocationBar);
- FRIEND_TEST_ALL_PREFIXES(PermissionBubbleKioskBrowserTest,
- KioskHasNoLocationBar);
-
+private:
NSWindow* parent_window_; // Weak.
Delegate* delegate_; // Weak.
// Cocoa-side UI controller for the bubble. Weak, as it will close itself.
PermissionBubbleController* bubbleController_;
- virtual bool HasLocationBar();
DISALLOW_COPY_AND_ASSIGN(PermissionBubbleCocoa);
};
« no previous file with comments | « chrome/browser/ui/cocoa/base_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698