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

Side by Side Diff: ash/shell.cc

Issue 2200893002: mash: Partially migrate ash/desktop_background to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mash browser test crash in GetMaxDisplaySizeInNative. 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 unified diff | Download patch
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell/content/client/shell_browser_main_parts.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/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "ash/frame/custom_frame_view_ash.h" 50 #include "ash/frame/custom_frame_view_ash.h"
51 #include "ash/high_contrast/high_contrast_controller.h" 51 #include "ash/high_contrast/high_contrast_controller.h"
52 #include "ash/host/ash_window_tree_host_init_params.h" 52 #include "ash/host/ash_window_tree_host_init_params.h"
53 #include "ash/ime/input_method_event_handler.h" 53 #include "ash/ime/input_method_event_handler.h"
54 #include "ash/magnifier/magnification_controller.h" 54 #include "ash/magnifier/magnification_controller.h"
55 #include "ash/magnifier/partial_magnification_controller.h" 55 #include "ash/magnifier/partial_magnification_controller.h"
56 #include "ash/root_window_controller.h" 56 #include "ash/root_window_controller.h"
57 #include "ash/shelf/shelf.h" 57 #include "ash/shelf/shelf.h"
58 #include "ash/shelf/shelf_widget.h" 58 #include "ash/shelf/shelf_widget.h"
59 #include "ash/shelf/shelf_window_watcher.h" 59 #include "ash/shelf/shelf_window_watcher.h"
60 #include "ash/shell_factory.h"
61 #include "ash/shell_init_params.h" 60 #include "ash/shell_init_params.h"
62 #include "ash/utility/screenshot_controller.h" 61 #include "ash/utility/screenshot_controller.h"
63 #include "ash/wm/ash_focus_rules.h" 62 #include "ash/wm/ash_focus_rules.h"
64 #include "ash/wm/ash_native_cursor_manager.h" 63 #include "ash/wm/ash_native_cursor_manager.h"
65 #include "ash/wm/event_client_impl.h" 64 #include "ash/wm/event_client_impl.h"
66 #include "ash/wm/lock_state_controller.h" 65 #include "ash/wm/lock_state_controller.h"
67 #include "ash/wm/overlay_event_filter.h" 66 #include "ash/wm/overlay_event_filter.h"
68 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" 67 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h"
69 #include "ash/wm/power_button_controller.h" 68 #include "ash/wm/power_button_controller.h"
70 #include "ash/wm/resize_shadow_controller.h" 69 #include "ash/wm/resize_shadow_controller.h"
(...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 1087
1089 void Shell::OnWindowActivated( 1088 void Shell::OnWindowActivated(
1090 aura::client::ActivationChangeObserver::ActivationReason reason, 1089 aura::client::ActivationChangeObserver::ActivationReason reason,
1091 aura::Window* gained_active, 1090 aura::Window* gained_active,
1092 aura::Window* lost_active) { 1091 aura::Window* lost_active) {
1093 if (gained_active) 1092 if (gained_active)
1094 target_root_window_ = gained_active->GetRootWindow(); 1093 target_root_window_ = gained_active->GetRootWindow();
1095 } 1094 }
1096 1095
1097 } // namespace ash 1096 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell/content/client/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698