OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/launcher/launcher_view.h" | 5 #include "ash/launcher/launcher_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/ash_constants.h" | 9 #include "ash/ash_constants.h" |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1159 case TYPE_APP_SHORTCUT: | 1159 case TYPE_APP_SHORTCUT: |
1160 case TYPE_PLATFORM_APP: | 1160 case TYPE_PLATFORM_APP: |
1161 return delegate_->GetTitle(model_->items()[view_index]); | 1161 return delegate_->GetTitle(model_->items()[view_index]); |
1162 | 1162 |
1163 case TYPE_APP_LIST: | 1163 case TYPE_APP_LIST: |
1164 return model_->status() == LauncherModel::STATUS_LOADING ? | 1164 return model_->status() == LauncherModel::STATUS_LOADING ? |
1165 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) : | 1165 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) : |
1166 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); | 1166 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); |
1167 | 1167 |
1168 case TYPE_BROWSER_SHORTCUT: | 1168 case TYPE_BROWSER_SHORTCUT: |
1169 return l10n_util::GetStringUTF16(IDS_AURA_NEW_TAB); | 1169 return Shell::GetInstance()->delegate()->GetProductName(); |
1170 } | 1170 } |
1171 return string16(); | 1171 return string16(); |
1172 } | 1172 } |
1173 | 1173 |
1174 void LauncherView::ButtonPressed(views::Button* sender, | 1174 void LauncherView::ButtonPressed(views::Button* sender, |
1175 const ui::Event& event) { | 1175 const ui::Event& event) { |
1176 // Do not handle mouse release during drag. | 1176 // Do not handle mouse release during drag. |
1177 if (dragging()) | 1177 if (dragging()) |
1178 return; | 1178 return; |
1179 | 1179 |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1350 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, | 1350 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, |
1351 OnLauncherIconPositionsChanged()); | 1351 OnLauncherIconPositionsChanged()); |
1352 PreferredSizeChanged(); | 1352 PreferredSizeChanged(); |
1353 } | 1353 } |
1354 | 1354 |
1355 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { | 1355 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { |
1356 } | 1356 } |
1357 | 1357 |
1358 } // namespace internal | 1358 } // namespace internal |
1359 } // namespace ash | 1359 } // namespace ash |
OLD | NEW |