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

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

Issue 2889523003: Add kApplicationIdKey for ShellSurface::GetApplicationId and SetApplicationId (Closed)
Patch Set: Fix shell_surface_unittest. 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 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 1c03c77232922926989008947daa7f1b8dd54c3b..4094ecd7dfb30d2d50ef6749dc2bad1754d4eb91 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
@@ -711,12 +711,12 @@ void ArcAppWindowLauncherController::SetOrientationLockForAppWindow(
// static
int ArcAppWindowLauncherController::GetWindowTaskId(aura::Window* window) {
- const std::string arc_app_id = exo::ShellSurface::GetApplicationId(window);
- if (arc_app_id.empty())
+ const std::string* arc_app_id = exo::ShellSurface::GetApplicationId(window);
+ if (!arc_app_id)
return -1;
int task_id = -1;
- if (sscanf(arc_app_id.c_str(), "org.chromium.arc.%d", &task_id) != 1)
+ if (sscanf(arc_app_id->c_str(), "org.chromium.arc.%d", &task_id) != 1)
return -1;
return task_id;
« no previous file with comments | « chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.cc ('k') | components/exo/shell_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698