| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_EXCLUSIVE_ACCESS_CONTROLLER_VIEWS_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_EXCLUSIVE_ACCESS_CONTROLLER_VIEWS_H_ |
| 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_EXCLUSIVE_ACCESS_CONTROLLER_VIEWS_H_ | 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_EXCLUSIVE_ACCESS_CONTROLLER_VIEWS_H_ |
| 7 | 7 |
| 8 // Note this file has a _views suffix so that it may have an optional runtime | 8 // Note this file has a _views suffix so that it may have an optional runtime |
| 9 // dependency on toolkit-views UI. | 9 // dependency on toolkit-views UI. |
| 10 | 10 |
| 11 #import <CoreGraphics/CoreGraphics.h> | 11 #import <CoreGraphics/CoreGraphics.h> |
| 12 | 12 |
| 13 #include <memory> |
| 14 |
| 13 #import "base/mac/scoped_nsobject.h" | 15 #import "base/mac/scoped_nsobject.h" |
| 14 #include "base/macros.h" | 16 #include "base/macros.h" |
| 15 #include "base/memory/scoped_ptr.h" | |
| 16 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" | 17 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" |
| 17 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h" | 18 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h" |
| 18 #include "components/prefs/pref_change_registrar.h" | 19 #include "components/prefs/pref_change_registrar.h" |
| 19 #include "ui/base/accelerators/accelerator.h" | 20 #include "ui/base/accelerators/accelerator.h" |
| 20 | 21 |
| 21 class Browser; | 22 class Browser; |
| 22 class BrowserWindow; | 23 class BrowserWindow; |
| 23 @class BrowserWindowController; | 24 @class BrowserWindowController; |
| 24 class ExclusiveAccessBubbleViews; | 25 class ExclusiveAccessBubbleViews; |
| 25 @class ExclusiveAccessBubbleWindowController; | 26 @class ExclusiveAccessBubbleWindowController; |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 90 |
| 90 BrowserWindowController* controller_; // Weak. Owns |this|. | 91 BrowserWindowController* controller_; // Weak. Owns |this|. |
| 91 Browser* browser_; // Weak. Owned by controller. | 92 Browser* browser_; // Weak. Owned by controller. |
| 92 | 93 |
| 93 // When going fullscreen for a tab, we need to store the URL and the | 94 // When going fullscreen for a tab, we need to store the URL and the |
| 94 // fullscreen type, since we can't show the bubble until | 95 // fullscreen type, since we can't show the bubble until |
| 95 // -windowDidEnterFullScreen: gets called. | 96 // -windowDidEnterFullScreen: gets called. |
| 96 GURL url_; | 97 GURL url_; |
| 97 ExclusiveAccessBubbleType bubble_type_; | 98 ExclusiveAccessBubbleType bubble_type_; |
| 98 | 99 |
| 99 scoped_ptr<ExclusiveAccessBubbleViews> views_bubble_; | 100 std::unique_ptr<ExclusiveAccessBubbleViews> views_bubble_; |
| 100 base::scoped_nsobject<ExclusiveAccessBubbleWindowController> cocoa_bubble_; | 101 base::scoped_nsobject<ExclusiveAccessBubbleWindowController> cocoa_bubble_; |
| 101 | 102 |
| 102 // Used to keep track of the kShowFullscreenToolbar preference. | 103 // Used to keep track of the kShowFullscreenToolbar preference. |
| 103 PrefChangeRegistrar pref_registrar_; | 104 PrefChangeRegistrar pref_registrar_; |
| 104 | 105 |
| 105 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessController); | 106 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessController); |
| 106 }; | 107 }; |
| 107 | 108 |
| 108 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_EXCLUSIVE_ACCESS_CONTROLLER_VIEWS_H_ | 109 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_EXCLUSIVE_ACCESS_CONTROLLER_VIEWS_H_ |
| OLD | NEW |