Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(329)

Unified Diff: ash/wm/maximize_bubble_controller.h

Issue 10855150: Revert 151485 - Adding unit tests for maximize menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « ash/wm/custom_frame_view_ash_unittest.cc ('k') | ash/wm/maximize_bubble_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « ash/wm/custom_frame_view_ash_unittest.cc ('k') | ash/wm/maximize_bubble_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698