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

Side by Side Diff: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix wallpaper tests again Created 4 years, 5 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h" 4 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
5 5
6 #include <string> 6 #include <string>
7 7
8 #include "ash/common/shelf/shelf_delegate.h"
8 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 9 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
9 #include "ash/common/wm/window_state.h" 10 #include "ash/common/wm/window_state.h"
10 #include "ash/common/wm_lookup.h" 11 #include "ash/common/wm_lookup.h"
11 #include "ash/common/wm_shell.h" 12 #include "ash/common/wm_shell.h"
12 #include "ash/display/display_manager.h" 13 #include "ash/display/display_manager.h"
13 #include "ash/display/screen_orientation_controller_chromeos.h" 14 #include "ash/display/screen_orientation_controller_chromeos.h"
14 #include "ash/shelf/shelf_delegate.h"
15 #include "ash/shelf/shelf_util.h" 15 #include "ash/shelf/shelf_util.h"
16 #include "ash/shell.h" 16 #include "ash/shell.h"
17 #include "ash/wm/window_state_aura.h" 17 #include "ash/wm/window_state_aura.h"
18 #include "ash/wm/window_util.h" 18 #include "ash/wm/window_util.h"
19 #include "base/bind.h" 19 #include "base/bind.h"
20 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 20 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
21 #include "chrome/browser/chromeos/arc/arc_support_host.h" 21 #include "chrome/browser/chromeos/arc/arc_support_host.h"
22 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" 23 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
24 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller .h" 24 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller .h"
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 if (orientation_lock == arc::mojom::OrientationLock::CURRENT) { 600 if (orientation_lock == arc::mojom::OrientationLock::CURRENT) {
601 // Resolve the orientation when it first resolved. 601 // Resolve the orientation when it first resolved.
602 orientation_lock = GetCurrentOrientation(); 602 orientation_lock = GetCurrentOrientation();
603 app_window->set_requested_orientation_lock(orientation_lock); 603 app_window->set_requested_orientation_lock(orientation_lock);
604 } 604 }
605 605
606 ash::Shell* shell = ash::Shell::GetInstance(); 606 ash::Shell* shell = ash::Shell::GetInstance();
607 shell->screen_orientation_controller()->LockOrientationForWindow( 607 shell->screen_orientation_controller()->LockOrientationForWindow(
608 window, BlinkOrientationLockFromMojom(orientation_lock)); 608 window, BlinkOrientationLockFromMojom(orientation_lock));
609 } 609 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698