Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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_TAB_CONTENTS_OVERLAYABLE_CONTENTS_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_OVERLAYABLE_CONTENTS_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_OVERLAYABLE_CONTENTS_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_OVERLAYABLE_CONTENTS_CONTROLLER_H_ |
| 7 | 7 |
| 8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
| 9 | 9 |
| 10 #include "base/mac/scoped_nsobject.h" | 10 #include "base/mac/scoped_nsobject.h" |
| 11 #include "base/memory/scoped_ptr.h" | |
| 12 | |
| 13 class Browser; | |
| 14 | |
| 15 namespace content { | |
| 16 class WebContents; | |
| 17 } | |
| 18 | 11 |
| 19 // OverlayableContentsController is an obsolete wrapper holding the view where a | 12 // OverlayableContentsController is an obsolete wrapper holding the view where a |
| 20 // tab's WebContents is displayed. In the old Chrome Instant implementation it | 13 // tab's WebContents is displayed. In the old Chrome Instant implementation it |
| 21 // multiplexed between the tab's contents and an overlay's contents. Now there | 14 // multiplexed between the tab's contents and an overlay's contents. Now there |
| 22 // is no overlay, but ripping this class out entirely is hard. | 15 // is no overlay, but ripping this class out entirely is hard. |
| 23 // | 16 // |
| 24 // TODO(sail): Remove this class and replace it with something saner. | 17 // TODO(sail): Remove this class and replace it with something saner. |
| 25 @interface OverlayableContentsController : NSViewController { | 18 @interface OverlayableContentsController : NSViewController { |
| 26 @private | 19 @private |
| 27 // Container view for the "active" contents. | 20 // Container view for the "active" contents. |
| 28 base::scoped_nsobject<NSView> activeContainer_; | 21 base::scoped_nsobject<NSView> activeContainer_; |
| 29 } | 22 } |
| 30 | 23 |
| 31 @property(readonly, nonatomic) NSView* activeContainer; | 24 @property(readonly, nonatomic) NSView* activeContainer; |
| 32 | 25 |
| 33 // Initialization. | 26 // Initialization. |
| 34 - (id)initWithBrowser:(Browser*)browser; | 27 - (id)init; |
|
tapted
2015/07/06 07:26:18
this is now an override, so no need to redeclare
jackhou1
2015/07/07 03:27:27
Done.
| |
| 35 | 28 |
| 36 @end | 29 @end |
| 37 | 30 |
| 38 #endif // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_OVERLAYABLE_CONTENTS_CONTROLLER_ H_ | 31 #endif // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_OVERLAYABLE_CONTENTS_CONTROLLER_ H_ |
| OLD | NEW |