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

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash. (Closed)
Patch Set: Fix and workaround test issues. Created 4 years, 2 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
Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
index 6d14cb3c14405c65a44161ed425bc47af42f4dc4..bcebcc77bd085e32acf49f00dc375103e891c4ba 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
@@ -259,8 +259,8 @@ ArcAppWindowLauncherController::ArcAppWindowLauncherController(
ChromeLauncherController* owner,
ash::ShelfDelegate* shelf_delegate)
: AppWindowLauncherController(owner), shelf_delegate_(shelf_delegate) {
- if (arc::ArcAuthService::IsAllowedForProfile(owner->GetProfile())) {
- observed_profile_ = owner->GetProfile();
+ if (arc::ArcAuthService::IsAllowedForProfile(owner->profile())) {
+ observed_profile_ = owner->profile();
StartObserving(observed_profile_);
}
}
@@ -350,7 +350,7 @@ void ArcAppWindowLauncherController::OnWindowVisibilityChanged(
// the window is registered in multi-user manager and this manager may
// consider this new window as hidden for current profile. Multi-user manager
// uses OnWindowVisibilityChanging event to update window state.
- if (visible && observed_profile_ == owner()->GetProfile())
+ if (visible && observed_profile_ == owner()->profile())
AttachControllerToWindowIfNeeded(window);
}
@@ -475,7 +475,7 @@ void ArcAppWindowLauncherController::OnTaskCreated(
task_id_to_app_window_info_[task_id] =
base::MakeUnique<AppWindowInfo>(shelf_app_id);
// Don't create shelf icon for non-primary user.
- if (observed_profile_ != owner()->GetProfile())
+ if (observed_profile_ != owner()->profile())
return;
AttachControllerToWindowsIfNeeded();
@@ -510,7 +510,7 @@ void ArcAppWindowLauncherController::OnTaskDestroyed(int task_id) {
}
void ArcAppWindowLauncherController::OnTaskSetActive(int32_t task_id) {
- if (observed_profile_ != owner()->GetProfile()) {
+ if (observed_profile_ != owner()->profile()) {
active_task_id_ = task_id;
return;
}

Powered by Google App Engine
This is Rietveld 408576698