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

Unified Diff: trunk/src/ash/wm/caption_buttons/frame_maximize_button.h

Issue 165283003: Revert 251206 "Fixes crashes wrt to the maximize button when:" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 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 | « no previous file | trunk/src/ash/wm/caption_buttons/frame_maximize_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/wm/caption_buttons/frame_maximize_button.h
===================================================================
--- trunk/src/ash/wm/caption_buttons/frame_maximize_button.h (revision 251215)
+++ trunk/src/ash/wm/caption_buttons/frame_maximize_button.h (working copy)
@@ -8,7 +8,6 @@
#include "ash/ash_export.h"
#include "ash/wm/caption_buttons/caption_button_types.h"
#include "ash/wm/caption_buttons/frame_caption_button.h"
-#include "ash/wm/window_state_observer.h"
#include "ash/wm/workspace/snap_types.h"
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
@@ -33,8 +32,7 @@
// Button used for the maximize control on the frame. Handles snapping logic.
class ASH_EXPORT FrameMaximizeButton : public FrameCaptionButton,
public views::WidgetObserver,
- public aura::WindowObserver,
- public wm::WindowStateObserver {
+ public aura::WindowObserver {
public:
FrameMaximizeButton(views::ButtonListener* listener,
views::Widget* frame);
@@ -69,10 +67,6 @@
intptr_t old) OVERRIDE;
virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
- // wm::WindowStateObserver override:
- virtual void OnWindowShowTypeChanged(wm::WindowState* window_state,
- wm::WindowShowType old_type) OVERRIDE;
-
// WidgetObserver overrides:
virtual void OnWidgetActivationChanged(views::Widget* widget,
bool active) OVERRIDE;
« no previous file with comments | « no previous file | trunk/src/ash/wm/caption_buttons/frame_maximize_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698