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

Side by Side Diff: ash/shelf/shelf_layout_manager.cc

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken relative include. Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « ash/shelf/shelf_button.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shelf/shelf_layout_manager.h" 5 #include "ash/shelf/shelf_layout_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <cstring> 9 #include <cstring>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/accelerators/accelerator_commands.h" 13 #include "ash/accelerators/accelerator_commands.h"
14 #include "ash/ash_switches.h"
15 #include "ash/aura/wm_window_aura.h" 14 #include "ash/aura/wm_window_aura.h"
15 #include "ash/common/ash_switches.h"
16 #include "ash/common/session/session_state_delegate.h" 16 #include "ash/common/session/session_state_delegate.h"
17 #include "ash/common/shelf/shelf_constants.h" 17 #include "ash/common/shelf/shelf_constants.h"
18 #include "ash/common/shelf/wm_shelf_util.h" 18 #include "ash/common/shelf/wm_shelf_util.h"
19 #include "ash/common/shell_window_ids.h" 19 #include "ash/common/shell_window_ids.h"
20 #include "ash/common/wm/mru_window_tracker.h" 20 #include "ash/common/wm/mru_window_tracker.h"
21 #include "ash/common/wm/window_state.h" 21 #include "ash/common/wm/window_state.h"
22 #include "ash/common/wm_root_window_controller.h" 22 #include "ash/common/wm_root_window_controller.h"
23 #include "ash/common/wm_root_window_controller_observer.h" 23 #include "ash/common/wm_root_window_controller_observer.h"
24 #include "ash/common/wm_shell.h" 24 #include "ash/common/wm_shell.h"
25 #include "ash/root_window_controller.h" 25 #include "ash/root_window_controller.h"
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1182 UpdateBoundsAndOpacity(target_bounds, true, NULL); 1182 UpdateBoundsAndOpacity(target_bounds, true, NULL);
1183 UpdateVisibilityState(); 1183 UpdateVisibilityState();
1184 } 1184 }
1185 1185
1186 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() { 1186 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() {
1187 UpdateVisibilityState(); 1187 UpdateVisibilityState();
1188 LayoutShelf(); 1188 LayoutShelf();
1189 } 1189 }
1190 1190
1191 } // namespace ash 1191 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_button.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698