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

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

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 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 unified diff | Download patch
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shelf/shelf_window_watcher_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_window_watcher.h" 5 #include "ash/shelf/shelf_window_watcher.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "ash/public/cpp/config.h" 10 #include "ash/public/cpp/config.h"
11 #include "ash/public/cpp/shell_window_ids.h" 11 #include "ash/public/cpp/shell_window_ids.h"
12 #include "ash/public/cpp/window_properties.h" 12 #include "ash/public/cpp/window_properties.h"
13 #include "ash/shelf/shelf_constants.h" 13 #include "ash/shelf/shelf_constants.h"
14 #include "ash/shelf/shelf_model.h" 14 #include "ash/shelf/shelf_model.h"
15 #include "ash/shelf/shelf_window_watcher_item_delegate.h" 15 #include "ash/shelf/shelf_window_watcher_item_delegate.h"
16 #include "ash/shell.h" 16 #include "ash/shell.h"
17 #include "ash/shell_port.h" 17 #include "ash/shell_port.h"
18 #include "ash/wm/window_state.h" 18 #include "ash/wm/window_state.h"
19 #include "ash/wm/window_state_aura.h"
20 #include "ash/wm/window_util.h" 19 #include "ash/wm/window_util.h"
21 #include "ash/wm_window.h" 20 #include "ash/wm_window.h"
22 #include "base/strings/string_number_conversions.h" 21 #include "base/strings/string_number_conversions.h"
23 #include "ui/aura/client/aura_constants.h" 22 #include "ui/aura/client/aura_constants.h"
24 #include "ui/aura/window.h" 23 #include "ui/aura/window.h"
25 #include "ui/base/resource/resource_bundle.h" 24 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/display/display.h" 25 #include "ui/display/display.h"
27 #include "ui/display/screen.h" 26 #include "ui/display/screen.h"
28 #include "ui/resources/grit/ui_resources.h" 27 #include "ui/resources/grit/ui_resources.h"
29 #include "ui/wm/public/activation_client.h" 28 #include "ui/wm/public/activation_client.h"
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 } 295 }
297 } 296 }
298 297
299 void ShelfWindowWatcher::OnDisplayRemoved(const display::Display& old_display) { 298 void ShelfWindowWatcher::OnDisplayRemoved(const display::Display& old_display) {
300 } 299 }
301 300
302 void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&, 301 void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&,
303 uint32_t) {} 302 uint32_t) {}
304 303
305 } // namespace ash 304 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shelf/shelf_window_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698