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

Unified Diff: ash/common/shelf/shelf_layout_manager.cc

Issue 2702663002: [Merge to M57] cros-md: Remove the non-MD immersive mode code paths (Closed)
Patch Set: Created 3 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
Index: ash/common/shelf/shelf_layout_manager.cc
diff --git a/ash/common/shelf/shelf_layout_manager.cc b/ash/common/shelf/shelf_layout_manager.cc
index 1639fba8bd4276a39916816cf9cbdb67f306c7d9..ce55bf9fd44a8f98094953321f3be75b6f7e3eeb 100644
--- a/ash/common/shelf/shelf_layout_manager.cc
+++ b/ash/common/shelf/shelf_layout_manager.cc
@@ -8,7 +8,6 @@
#include <cmath>
#include <vector>
-#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/session/session_controller.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/shelf_constants.h"
@@ -1039,13 +1038,10 @@ float ShelfLayoutManager::ComputeTargetOpacity(const State& state) {
// In Chrome OS Material Design, when shelf is hidden during auto hide state,
// target bounds are also hidden. So the window can extend to the edge of
// screen.
- if (ash::MaterialDesignController::IsImmersiveModeMaterial()) {
- return (state.visibility_state == SHELF_AUTO_HIDE &&
- state.auto_hide_state == SHELF_AUTO_HIDE_SHOWN)
- ? 1.0f
- : 0.0f;
- }
- return (state.visibility_state == SHELF_AUTO_HIDE) ? 1.0f : 0.0f;
+ return (state.visibility_state == SHELF_AUTO_HIDE &&
+ state.auto_hide_state == SHELF_AUTO_HIDE_SHOWN)
+ ? 1.0f
+ : 0.0f;
}
bool ShelfLayoutManager::IsShelfHiddenForFullscreen() const {

Powered by Google App Engine
This is Rietveld 408576698