OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ui/aura_shell/launcher/launcher_view.h" | 5 #include "ui/aura_shell/launcher/launcher_view.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "grit/ui_resources.h" | 8 #include "grit/ui_resources.h" |
9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
10 #include "ui/aura_shell/launcher/app_launcher_button.h" | 10 #include "ui/aura_shell/launcher/app_launcher_button.h" |
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
591 } | 591 } |
592 | 592 |
593 void LauncherView::ButtonPressed(views::Button* sender, | 593 void LauncherView::ButtonPressed(views::Button* sender, |
594 const views::Event& event) { | 594 const views::Event& event) { |
595 ShellDelegate* delegate = Shell::GetInstance()->delegate(); | 595 ShellDelegate* delegate = Shell::GetInstance()->delegate(); |
596 if (!delegate) | 596 if (!delegate) |
597 return; | 597 return; |
598 if (sender == new_browser_button_) { | 598 if (sender == new_browser_button_) { |
599 delegate->CreateNewWindow(); | 599 delegate->CreateNewWindow(); |
600 } else if (sender == show_apps_button_) { | 600 } else if (sender == show_apps_button_) { |
601 delegate->ShowApps(); | 601 Shell::GetInstance()->ToggleAppList(); |
602 } else if (sender == overflow_button_) { | 602 } else if (sender == overflow_button_) { |
603 ShowOverflowMenu(); | 603 ShowOverflowMenu(); |
604 } else { | 604 } else { |
605 int view_index = view_model_->GetIndexOfView(sender); | 605 int view_index = view_model_->GetIndexOfView(sender); |
606 // May be -1 while in the process of animating closed. | 606 // May be -1 while in the process of animating closed. |
607 if (view_index != -1) | 607 if (view_index != -1) |
608 delegate->LauncherItemClicked(model_->items()[view_index]); | 608 delegate->LauncherItemClicked(model_->items()[view_index]); |
609 } | 609 } |
610 } | 610 } |
611 | 611 |
612 } // namespace internal | 612 } // namespace internal |
613 } // namespace aura_shell | 613 } // namespace aura_shell |
OLD | NEW |