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

Unified Diff: ash/sysui/shelf_delegate_mus.cc

Issue 2138483002: mash: Implement restore on item click. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: skip the redundant check 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/public/interfaces/user_window_controller.mojom ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/shelf_delegate_mus.cc
diff --git a/ash/sysui/shelf_delegate_mus.cc b/ash/sysui/shelf_delegate_mus.cc
index 5a925bd15435dce65457e33aa403dfd7314d2c09..773a9ad121708ef3190c9176dddeb07ca248c334 100644
--- a/ash/sysui/shelf_delegate_mus.cc
+++ b/ash/sysui/shelf_delegate_mus.cc
@@ -94,7 +94,7 @@ class ShelfItemDelegateMus : public ShelfItemDelegate {
return false;
}
void ExecuteCommand(int command_id, int event_flags) override {
- item_delegate_->user_window_controller_->FocusUserWindow(command_id);
+ item_delegate_->user_window_controller_->ActivateUserWindow(command_id);
}
private:
@@ -111,7 +111,7 @@ class ShelfItemDelegateMus : public ShelfItemDelegate {
return kNewWindowCreated;
}
if (window_id_to_title_.size() == 1) {
- user_window_controller_->FocusUserWindow(
+ user_window_controller_->ActivateUserWindow(
window_id_to_title_.begin()->first);
return kExistingWindowActivated;
}
« no previous file with comments | « ash/public/interfaces/user_window_controller.mojom ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698