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

Unified Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

Issue 309973002: Revert of Animate window control changes in TouchView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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
Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index 5e183849dcaefde2d2c69b7f4295e7c76c1d59ed..90b375e3feafc72347f6f044f21c124631d4a670 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -3,8 +3,6 @@
// found in the LICENSE file.
#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
-
-#include <algorithm>
#include "ash/ash_switches.h"
#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
@@ -379,20 +377,6 @@
}
///////////////////////////////////////////////////////////////////////////////
-// views::View:
-
-void BrowserNonClientFrameViewAsh::
- ChildPreferredSizeChanged(views::View* child) {
-// FrameCaptionButtonContainerView animates the visibility changes in
-// UpdateSizeButtonVisibility(false). Due to this a new size is not available
-// until the completion of the animation. Layout in response to the preferred
-// size changes.
- if (child != caption_button_container_)
- return;
- frame()->GetRootView()->Layout();
-}
-
-///////////////////////////////////////////////////////////////////////////////
// BrowserNonClientFrameViewAsh, private:
int BrowserNonClientFrameViewAsh::GetTabStripLeftInset() const {

Powered by Google App Engine
This is Rietveld 408576698