Index: ash/wm/maximize_bubble_controller.h |
=================================================================== |
--- ash/wm/maximize_bubble_controller.h (revision 151488) |
+++ ash/wm/maximize_bubble_controller.h (working copy) |
@@ -9,16 +9,12 @@ |
#include "ash/wm/workspace/snap_types.h" |
#include "base/memory/scoped_ptr.h" |
-namespace aura { |
-class Window; |
-} |
- |
namespace base { |
class Timer; |
} |
-namespace views { |
-class CustomButton; |
+namespace aura { |
+class Window; |
} |
namespace ash { |
@@ -31,8 +27,7 @@ |
class Bubble; |
MaximizeBubbleController(FrameMaximizeButton* frame_maximize_button, |
- bool is_maximized, |
- int appearance_delay_ms); |
+ bool is_maximized); |
// Called from the outside to destroy the interface to the UI visuals. |
// The visuals will then delete when possible (maybe asynchronously). |
virtual ~MaximizeBubbleController(); |
@@ -63,10 +58,6 @@ |
// The status of the associated window: Maximized or normal. |
bool is_maximized() const { return is_maximized_; } |
- // A unit test function to return buttons of the sub menu. |state| can be |
- // either SNAP_LEFT, SNAP_RIGHT or SNAP_MINIMIZE. |
- views::CustomButton* GetButtonForUnitTest(SnapType state); |
- |
protected: |
// Called from the the Bubble class to destroy itself: It tells the owning |
// object that it will destroy itself asynchronously. The owner will then |
@@ -89,9 +80,6 @@ |
// The timer for the delayed creation of the menu. |
scoped_ptr<base::Timer> timer_; |
- // The appearance delay in ms (delay and fade in & fade out delay). |
- const int appearance_delay_ms_; |
- |
DISALLOW_COPY_AND_ASSIGN(MaximizeBubbleController); |
}; |