| 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_VIEWS_FRAME_CONTENTS_CONTAINER_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_CONTAINER_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_CONTAINER_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_CONTAINER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 // The caller must delete or remove the old active view separately. | 39 // The caller must delete or remove the old active view separately. |
| 40 void MakeOverlayContentsActiveContents(); | 40 void MakeOverlayContentsActiveContents(); |
| 41 | 41 |
| 42 // Sets the overlay view. This does not delete the old. | 42 // Sets the overlay view. This does not delete the old. |
| 43 void SetOverlay(views::WebView* overlay, | 43 void SetOverlay(views::WebView* overlay, |
| 44 content::WebContents* overlay_web_contents, | 44 content::WebContents* overlay_web_contents, |
| 45 int height, | 45 int height, |
| 46 InstantSizeUnits units, | 46 InstantSizeUnits units, |
| 47 bool draw_drop_shadow); | 47 bool draw_drop_shadow); |
| 48 | 48 |
| 49 // When the active content is reset and we have a visible overlay, | |
| 50 // the overlay must be stacked back at top. | |
| 51 void MaybeStackOverlayAtTop(); | |
| 52 | |
| 53 content::WebContents* overlay_web_contents() const { | 49 content::WebContents* overlay_web_contents() const { |
| 54 return overlay_web_contents_; | 50 return overlay_web_contents_; |
| 55 } | 51 } |
| 56 | 52 |
| 57 int overlay_height() const { | 53 int overlay_height() const { |
| 58 return overlay_ ? overlay_->bounds().height() : 0; | 54 return overlay_ ? overlay_->bounds().height() : 0; |
| 59 } | 55 } |
| 60 | 56 |
| 61 // Sets the active top margin; the active WebView's y origin would be | 57 // Sets the active top margin; the active WebView's y origin would be |
| 62 // positioned at this |margin|, causing the active WebView to be pushed down | 58 // positioned at this |margin|, causing the active WebView to be pushed down |
| (...skipping 30 matching lines...) Expand all Loading... |
| 93 // The desired height of the overlay and units. | 89 // The desired height of the overlay and units. |
| 94 int overlay_height_; | 90 int overlay_height_; |
| 95 InstantSizeUnits overlay_height_units_; | 91 InstantSizeUnits overlay_height_units_; |
| 96 | 92 |
| 97 content::NotificationRegistrar registrar_; | 93 content::NotificationRegistrar registrar_; |
| 98 | 94 |
| 99 DISALLOW_COPY_AND_ASSIGN(ContentsContainer); | 95 DISALLOW_COPY_AND_ASSIGN(ContentsContainer); |
| 100 }; | 96 }; |
| 101 | 97 |
| 102 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_CONTAINER_H_ | 98 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_CONTAINER_H_ |
| OLD | NEW |