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

Unified Diff: chrome/browser/ui/cocoa/browser_window_cocoa.h

Issue 877413004: Refactor away the Browser* dependency in exclusive_access (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken mac change Created 5 years, 10 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
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/browser_window_cocoa.h
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h
index 018d88c4c16d2bc0f9341dd255fe24e9ae5bead0..a1ae062e7220a179f1992b3d54354cab5dbdbc66 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
@@ -10,6 +10,7 @@
#include "chrome/browser/extensions/extension_keybinding_registry.h"
#include "chrome/browser/signin/signin_header_helper.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
#include "chrome/browser/ui/search/search_model_observer.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "ui/base/ui_base_types.h"
@@ -31,10 +32,11 @@ class Extension;
// the Cocoa NSWindow. Cross-platform code will interact with this object when
// it needs to manipulate the window.
-class BrowserWindowCocoa :
- public BrowserWindow,
- public extensions::ExtensionKeybindingRegistry::Delegate,
- public SearchModelObserver {
+class BrowserWindowCocoa
+ : public BrowserWindow,
+ public ExclusiveAccessContext,
+ public extensions::ExtensionKeybindingRegistry::Delegate,
+ public SearchModelObserver {
public:
BrowserWindowCocoa(Browser* browser,
BrowserWindowController* controller);
@@ -78,7 +80,7 @@ class BrowserWindowCocoa :
ExclusiveAccessBubbleType type,
bool with_toolbar) override;
void ExitFullscreen() override;
- void UpdateFullscreenExitBubbleContent(
+ void UpdateExclusiveAccessExitBubbleContent(
const GURL& url,
ExclusiveAccessBubbleType bubble_type) override;
bool ShouldHideUIForFullscreen() const override;
@@ -157,6 +159,13 @@ class BrowserWindowCocoa :
int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
void ExecuteExtensionCommand(const extensions::Extension* extension,
const extensions::Command& command) override;
+ ExclusiveAccessContext* GetExclusiveAccessContext() override;
+
+ // ExclusiveAccessContext interface
+ Profile* GetProfile() override;
+ content::WebContents* GetActiveWebContents() override;
+ void UnhideDownloadShelf() override;
+ void HideDownloadShelf() override;
// Overridden from ExtensionKeybindingRegistry::Delegate:
extensions::ActiveTabPermissionGranter* GetActiveTabPermissionGranter()
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698