Show the app title when the window title is empty for ARC apps

chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
@@ skipping 29 matching lines @@
 
 ash::ShelfMenuModel* ArcAppWindowLauncherItemController::CreateApplicationMenu(
     int event_flags) {
   return new LauncherApplicationMenuItemModel(GetApplicationList(event_flags));
 }
 
 ChromeLauncherAppMenuItems
 ArcAppWindowLauncherItemController::GetApplicationList(int event_flags) {
   ChromeLauncherAppMenuItems items =
       AppWindowLauncherItemController::GetApplicationList(event_flags);
-  size_t i = 0;
-  for (auto it = windows().begin(); it != windows().end(); ++it, ++i) {
+  for (auto it = windows().begin(); it != windows().end(); ++it) {
     // TODO(khmel): resolve correct icon here.
+    size_t i = std::distance(windows().begin(), it);
     gfx::Image image;
     aura::Window* window = (*it)->GetNativeWindow();
     items.push_back(new ChromeLauncherAppMenuItemV2App(
-        (window ? window->title() : GetTitle()), &image, app_id(),
-        launcher_controller(), i, i == 0 /* has_leading_separator */));
+        ((window && !window->title().empty()) ? window->title() : GetTitle()),
+        &image, app_id(), launcher_controller(), i,
+        i == 0 /* has_leading_separator */));
   }
   return items;
 }