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

Unified Diff: ash/wm/frame_painter.cc

Issue 11201002: Removes worskpace 1 code. Will rename next. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove constants and add back kDisableLoginAnimations Created 8 years, 2 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/base_layout_manager.cc ('k') | ash/wm/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/frame_painter.cc
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
index 1f77072d27f66c061ee5cba39fb61d2431b2fd6a..e0c74d178d27a3dac8be9e64fd746271e39db9dd 100644
--- a/ash/wm/frame_painter.cc
+++ b/ash/wm/frame_painter.cc
@@ -471,8 +471,7 @@ void FramePainter::PaintTitleBar(views::NonClientFrameView* view,
void FramePainter::LayoutHeader(views::NonClientFrameView* view,
bool shorter_layout) {
// The new assets only make sense if the window is actually maximized.
- if (internal::WorkspaceController::IsWorkspace2Enabled() &&
- shorter_layout && frame_->IsMaximized() &&
+ if (shorter_layout && frame_->IsMaximized() &&
GetTrackedByWorkspace(frame_->GetNativeWindow())) {
SetButtonImages(close_button_,
IDR_AURA_WINDOW_MAXIMIZED_CLOSE2,
@@ -652,9 +651,7 @@ int FramePainter::GetHeaderOpacity(HeaderMode header_mode,
// Maximized windows with workspace2 are totally transparent, except those not
// tracked by workspace code (which are used for tab dragging).
- if (frame_->IsMaximized() &&
- internal::WorkspaceController::IsWorkspace2Enabled() &&
- GetTrackedByWorkspace(frame_->GetNativeWindow()))
+ if (frame_->IsMaximized() && GetTrackedByWorkspace(frame_->GetNativeWindow()))
return 0;
// Single browser window is very transparent.
@@ -731,8 +728,7 @@ FramePainter* FramePainter::GetSoloPainterInRoot(
// the existence of a layout manager gets additionally tested.
if (IsVisibleNormalWindow((*it)->window_) &&
(!(*it)->window_->GetProperty(ash::kConstrainedWindowKey))) {
- if (internal::WorkspaceController::IsWorkspace2Enabled() &&
- wm::IsWindowMaximized((*it)->window_)) {
+ if (wm::IsWindowMaximized((*it)->window_)) {
return NULL;
}
if (painter)
« no previous file with comments | « ash/wm/base_layout_manager.cc ('k') | ash/wm/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698