Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(264)

Side by Side Diff: ui/aura_shell/launcher/launcher_view.cc

Issue 8558031: [Aura] Refactor and update app list window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync, change initial size close to final size to avoid CardSlider resize animation Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura_shell/examples/aura_shell_main.cc ('k') | ui/aura_shell/shell.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « ui/aura_shell/examples/aura_shell_main.cc ('k') | ui/aura_shell/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698