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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shelf/shelf_layout_manager.cc

Issue 2241273004: Move kUseNewVKWindowBehavior switch. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« ash/common/wm/workspace/workspace_layout_manager.cc ('K') | « ash/common/wm/workspace/workspace_layout_manager.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.cc
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index a4f758bb09fb8a1c7c388a4c82a533f309e85851..8e12dfdb2f043ad25b57c433ea5ead41dfa34a1b 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -8,7 +8,6 @@
#include <cmath>
#include <vector>
-#include "ash/common/ash_switches.h"
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/shelf_constants.h"
@@ -30,6 +29,7 @@
#include "base/auto_reset.h"
#include "base/command_line.h"
#include "base/i18n/rtl.h"
+#include "ui/base/ui_base_switches.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_animation_observer.h"
#include "ui/compositor/layer_animator.h"
@@ -427,7 +427,7 @@ void ShelfLayoutManager::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {
// the work area.
bool change_work_area =
(!base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kAshUseNewVKWindowBehavior) ||
+ ::switches::kUseNewVKWindowBehavior) ||
keyboard::KeyboardController::GetInstance()->get_lock_keyboard());
keyboard_bounds_ = new_bounds;
« ash/common/wm/workspace/workspace_layout_manager.cc ('K') | « ash/common/wm/workspace/workspace_layout_manager.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698