| 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 "ash/launcher/app_launcher_button.h" | 7 #include "ash/launcher/app_launcher_button.h" |
| 8 #include "ash/launcher/launcher_delegate.h" | 8 #include "ash/launcher/launcher_delegate.h" |
| 9 #include "ash/launcher/launcher_model.h" | 9 #include "ash/launcher/launcher_model.h" |
| 10 #include "ash/launcher/launcher_window_cycler.h" | 10 #include "ash/launcher/launcher_window_cycler.h" |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 | 207 |
| 208 const LauncherItems& items(model_->items()); | 208 const LauncherItems& items(model_->items()); |
| 209 for (LauncherItems::const_iterator i = items.begin(); i != items.end(); ++i) { | 209 for (LauncherItems::const_iterator i = items.begin(); i != items.end(); ++i) { |
| 210 views::View* child = CreateViewForItem(*i); | 210 views::View* child = CreateViewForItem(*i); |
| 211 child->SetPaintToLayer(true); | 211 child->SetPaintToLayer(true); |
| 212 view_model_->Add(child, static_cast<int>(i - items.begin())); | 212 view_model_->Add(child, static_cast<int>(i - items.begin())); |
| 213 AddChildView(child); | 213 AddChildView(child); |
| 214 } | 214 } |
| 215 | 215 |
| 216 overflow_button_ = new views::ImageButton(this); | 216 overflow_button_ = new views::ImageButton(this); |
| 217 overflow_button_->set_focusable(true); | 217 overflow_button_->set_accessibility_focusable(true); |
| 218 overflow_button_->SetImage( | 218 overflow_button_->SetImage( |
| 219 views::CustomButton::BS_NORMAL, | 219 views::CustomButton::BS_NORMAL, |
| 220 rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW).ToSkBitmap()); | 220 rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW).ToSkBitmap()); |
| 221 overflow_button_->SetImage( | 221 overflow_button_->SetImage( |
| 222 views::CustomButton::BS_HOT, | 222 views::CustomButton::BS_HOT, |
| 223 rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_HOT).ToSkBitmap()); | 223 rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_HOT).ToSkBitmap()); |
| 224 overflow_button_->SetImage( | 224 overflow_button_->SetImage( |
| 225 views::CustomButton::BS_PUSHED, | 225 views::CustomButton::BS_PUSHED, |
| 226 rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_PUSHED).ToSkBitmap()); | 226 rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_PUSHED).ToSkBitmap()); |
| 227 ConfigureChildView(overflow_button_); | 227 ConfigureChildView(overflow_button_); |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 657 return l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); | 657 return l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); |
| 658 | 658 |
| 659 case TYPE_BROWSER_SHORTCUT: | 659 case TYPE_BROWSER_SHORTCUT: |
| 660 return l10n_util::GetStringUTF16(IDS_AURA_CYCLER_TITLE); | 660 return l10n_util::GetStringUTF16(IDS_AURA_CYCLER_TITLE); |
| 661 } | 661 } |
| 662 return string16(); | 662 return string16(); |
| 663 } | 663 } |
| 664 | 664 |
| 665 } // namespace internal | 665 } // namespace internal |
| 666 } // namespace ash | 666 } // namespace ash |
| OLD | NEW |