Revert Aura changes

ash/launcher/launcher_view.cc

 // Copyright (c) 2012 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 "ash/launcher/launcher_view.h"
 
 #include "ash/launcher/app_launcher_button.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_window_cycler.h"
 #include "ash/launcher/tabbed_launcher_button.h"
 #include "ash/launcher/view_model.h"
 #include "ash/launcher/view_model_utils.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "base/utf_string_conversions.h"
-#include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/animation/throb_animation.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 183 matching lines @@
   overflow_button_->set_focusable(true);
   overflow_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW).ToSkBitmap());
   overflow_button_->SetImage(
       views::CustomButton::BS_HOT,
       rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_HOT).ToSkBitmap());
   overflow_button_->SetImage(
       views::CustomButton::BS_PUSHED,
       rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_PUSHED).ToSkBitmap());
-  overflow_button_->SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_AURA_LAUNCHER_OVERFLOW_NAME));
   ConfigureChildView(overflow_button_);
   AddChildView(overflow_button_);
 
   // We'll layout when our bounds change.
 }
 
 void LauncherView::LayoutToIdealBounds() {
   IdealBounds ideal_bounds;
   CalculateIdealBounds(&ideal_bounds);
   ViewModelUtils::SetViewBoundsToIdealBounds(*view_model_);
@@ skipping 403 matching lines @@
 
     case TYPE_BROWSER_SHORTCUT:
       cycler_->Cycle();
       break;
 
     default:
       NOTREACHED();
   }
 }
 
-string16 LauncherView::GetAccessibleName(views::View* view) {
-  ShellDelegate* delegate = Shell::GetInstance()->delegate();
-  if (!delegate)
-    return string16();
-  int view_index = view_model_->GetIndexOfView(view);
-  // May be -1 while in the process of animating closed.
-  if (view_index == -1)
-    return string16();
-
-  switch (model_->items()[view_index].type) {
-    case TYPE_TABBED:
-    case TYPE_APP:
-      return delegate->GetLauncherItemTitle(model_->items()[view_index]);
-
-    case TYPE_APP_LIST:
-      return l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE);
-
-    case TYPE_BROWSER_SHORTCUT:
-      return l10n_util::GetStringUTF16(IDS_AURA_CYCLER_TITLE);
-
-    default:
-      NOTREACHED();
-  }
-  return string16();
-}
-
 }  // namespace internal
 }  // namespace ash