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

Side by Side Diff: ash/launcher/launcher_view.cc

Issue 10825252: cleanup: Remove dead code in launcher_view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months 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 | « ash/launcher/launcher_view.h ('k') | ash/test/launcher_view_test_api.cc » ('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) 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/launcher/app_list_button.h" 9 #include "ash/launcher/app_list_button.h"
10 #include "ash/launcher/launcher_button.h" 10 #include "ash/launcher/launcher_button.h"
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 } 679 }
680 } 680 }
681 return std::pair<int, int>(min_index, max_index); 681 return std::pair<int, int>(min_index, max_index);
682 } 682 }
683 683
684 void LauncherView::ConfigureChildView(views::View* view) { 684 void LauncherView::ConfigureChildView(views::View* view) {
685 view->SetPaintToLayer(true); 685 view->SetPaintToLayer(true);
686 view->layer()->SetFillsBoundsOpaquely(false); 686 view->layer()->SetFillsBoundsOpaquely(false);
687 } 687 }
688 688
689 void LauncherView::GetOverflowItems(std::vector<LauncherItem>* items) {
690 int index = 0;
691 while (index < view_model_->view_size() &&
692 view_model_->view_at(index)->visible()) {
693 index++;
694 }
695 while (index < view_model_->view_size()) {
696 const LauncherItem& item = model_->items()[index];
697 if (item.type == TYPE_TABBED ||
698 item.type == TYPE_APP_PANEL ||
699 item.type == TYPE_APP_SHORTCUT)
700 items->push_back(item);
701 index++;
702 }
703 }
704
705 void LauncherView::ShowOverflowBubble() { 689 void LauncherView::ShowOverflowBubble() {
706 int first_overflow_index = last_visible_index_ + 1; 690 int first_overflow_index = last_visible_index_ + 1;
707 DCHECK_LT(first_overflow_index, view_model_->view_size() - 1); 691 DCHECK_LT(first_overflow_index, view_model_->view_size() - 1);
708 692
709 if (!overflow_bubble_.get()) 693 if (!overflow_bubble_.get())
710 overflow_bubble_.reset(new OverflowBubble()); 694 overflow_bubble_.reset(new OverflowBubble());
711 695
712 overflow_bubble_->Show(delegate_, 696 overflow_bubble_->Show(delegate_,
713 model_, 697 model_,
714 overflow_button_, 698 overflow_button_,
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, 1065 FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
1082 OnLauncherIconPositionsChanged()); 1066 OnLauncherIconPositionsChanged());
1083 PreferredSizeChanged(); 1067 PreferredSizeChanged();
1084 } 1068 }
1085 1069
1086 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { 1070 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) {
1087 } 1071 }
1088 1072
1089 } // namespace internal 1073 } // namespace internal
1090 } // namespace ash 1074 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/launcher_view.h ('k') | ash/test/launcher_view_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698