Display an app's short name in the app launcher

ui/app_list/cocoa/apps_grid_controller_unittest.mm

 // Copyright 2013 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 "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "testing/gtest_mac.h"
 #include "ui/app_list/app_list_constants.h"
@@ skipping 107 matching lines @@
   scoped_ptr<AppListTestViewDelegate> owned_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AppsGridControllerTest);
 };
 
 class AppListItemWithMenu : public AppListItemModel {
  public:
   AppListItemWithMenu(const std::string& title)
       : menu_model_(NULL),
         menu_ready_(true) {
-    SetTitle(title);
+    SetTitleAndFullName(title, title);
     menu_model_.AddItem(0, UTF8ToUTF16("Menu For: " + title));
   }
 
   void SetMenuReadyForTesting(bool ready) {
     menu_ready_ = ready;
   }
 
   virtual ui::MenuModel* GetContextMenuModel() OVERRIDE {
     if (!menu_ready_)
       return NULL;
@@ skipping 288 matching lines @@
 
   // Add an item (PopulateApps will create a duplicate "Item 0").
   model()->PopulateApps(1);
   EXPECT_EQ(3u, [[GetPageAt(0) content] count]);
   NSButton* button = GetItemViewAt(2);
   EXPECT_NSEQ(@"Item 0", [button title]);
   EXPECT_EQ(std::string("|Item 0,Item 1,Item 0|"), GetViewContent());
 
   // Update the title via the ItemModelObserver.
   app_list::AppListItemModel* item_model = model()->apps()->GetItemAt(2);
-  item_model->SetTitle("UpdatedItem");
+  item_model->SetTitleAndFullName("UpdatedItem", "UpdatedItem");
   EXPECT_NSEQ(@"UpdatedItem", [button title]);
   EXPECT_EQ(std::string("|Item 0,Item 1,UpdatedItem|"), GetViewContent());
 
   // Test icon updates through the model observer by ensuring the icon changes.
   NSSize icon_size = [[button image] size];
   EXPECT_EQ(0, icon_size.width);
   EXPECT_EQ(0, icon_size.height);
 
   SkBitmap bitmap;
   const int kTestImageSize = 10;
@@ skipping 12 matching lines @@
 
   // Test removing in the middle.
   model()->AddItem("Item 2");
   EXPECT_EQ(3u, [apps_grid_controller_ itemCount]);
   EXPECT_EQ(std::string("|Item 0,Item 1,Item 2|"), GetViewContent());
   model()->apps()->DeleteAt(1);
   EXPECT_EQ(2u, [apps_grid_controller_ itemCount]);
   EXPECT_EQ(std::string("|Item 0,Item 2|"), GetViewContent());
 
   // Test inserting in the middle.
-  model()->apps()->AddAt(1, model()->CreateItem("Item One"));
+  model()->apps()->AddAt(1, model()->CreateItem("Item One", "Item One"));
   EXPECT_EQ(3u, [apps_grid_controller_ itemCount]);
   EXPECT_EQ(std::string("|Item 0,Item One,Item 2|"), GetViewContent());
 
   // Test swapping items (e.g. rearranging via sync).
   model()->apps()->Move(1, 2);
   EXPECT_EQ(std::string("|Item 0,Item 2,Item One|"), GetViewContent());
 
   // Test removing multiple items via the model.
   model()->apps()->DeleteAll();
   EXPECT_EQ(0u, [apps_grid_controller_ itemCount]);
@@ skipping 439 matching lines @@
   EXPECT_EQ(nil, menu);
 
   item_two_model->SetMenuReadyForTesting(true);
   menu = [page menuForEvent:mouse_at_cell_1];
   EXPECT_EQ(1, [menu numberOfItems]);
   EXPECT_NSEQ(@"Menu For: Item Two", [[menu itemAtIndex:0] title]);
 }
 
 }  // namespace test
 }  // namespace app_list