chrome/browser/ui/exclusive_access/exclusive_access_bubble.h - Issue 877413004: Refactor away the Browser* dependency in exclusive_access

Unified Diff: chrome/browser/ui/exclusive_access/exclusive_access_bubble.h

Issue 877413004: Refactor away the Browser* dependency in exclusive_access (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rename toggle fullscreen function 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

« chrome/browser/ui/browser_window.h ('K') | « chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm ('k') | chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc » ('j') | chrome/browser/ui/exclusive_access/exclusive_access_context.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/exclusive_access/exclusive_access_bubble.h

diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h

index d7654abdb973af213299a17571aaa49826cabfbe..01c7b0234e804302ebe3ec4f5696b783f02da7fd 100644

--- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h

+++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h

@@ -11,7 +11,7 @@

#include "ui/gfx/geometry/point.h"

#include "url/gurl.h"

-class Browser;

+class ExclusiveAccessManager;

namespace gfx {

class Rect;

@@ -22,7 +22,7 @@ class Rect;

// state, namely fullscreen and mouse lock.

class ExclusiveAccessBubble : public gfx::AnimationDelegate {

public:

- explicit ExclusiveAccessBubble(Browser* browser,

+ explicit ExclusiveAccessBubble(ExclusiveAccessManager* manager,

const GURL& url,

ExclusiveAccessBubbleType bubble_type);

~ExclusiveAccessBubble() override;

@@ -71,7 +71,7 @@ class ExclusiveAccessBubble : public gfx::AnimationDelegate {

// on or off the screen as appropriate.

void CheckMousePosition();

- void ToggleFullscreen();

+ void ExitExclusiveAccess();

// Accepts the request. Can cause FullscreenExitBubble to be deleted.

void Accept();

// Denys the request. Can cause FullscreenExitBubble to be deleted.

@@ -85,8 +85,8 @@ class ExclusiveAccessBubble : public gfx::AnimationDelegate {

// The following strings never change.

base::string16 GetInstructionText() const;

- // The browser this bubble is in.

- Browser* browser_;

+ // The Manager associated with this bubble.

+ ExclusiveAccessManager* manager_;

miu 2015/02/26 20:07:56 nit: ExclusiveAccessManager* const manager_; Sinc

Sriram 2015/02/26 23:58:03 Done.

// The host the bubble is for, can be empty.

GURL url_;

miu 2015/02/26 20:07:56 ditto: const GURL url_;

Sriram 2015/02/26 23:58:03 This is not changed in this class but is modified