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

Side by Side Diff: ash/wm/app_list_controller.cc

Issue 23072036: Adds an integration test for uninstalling app list search results. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit indenting Created 7 years, 3 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
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/wm/app_list_controller.h" 5 #include "ash/wm/app_list_controller.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/launcher/launcher.h" 8 #include "ash/launcher/launcher.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/shelf/shelf_layout_manager.h" 10 #include "ash/shelf/shelf_layout_manager.h"
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 } 204 }
205 205
206 bool AppListController::IsVisible() const { 206 bool AppListController::IsVisible() const {
207 return view_ && view_->GetWidget()->IsVisible(); 207 return view_ && view_->GetWidget()->IsVisible();
208 } 208 }
209 209
210 aura::Window* AppListController::GetWindow() { 210 aura::Window* AppListController::GetWindow() {
211 return is_visible_ && view_ ? view_->GetWidget()->GetNativeWindow() : NULL; 211 return is_visible_ && view_ ? view_->GetWidget()->GetNativeWindow() : NULL;
212 } 212 }
213 213
214 app_list::AppListView* AppListController::GetViewForTesting() {
215 return view_;
216 }
217
214 //////////////////////////////////////////////////////////////////////////////// 218 ////////////////////////////////////////////////////////////////////////////////
215 // AppListController, private: 219 // AppListController, private:
216 220
217 void AppListController::SetDragAndDropHostOfCurrentAppList( 221 void AppListController::SetDragAndDropHostOfCurrentAppList(
218 app_list::ApplicationDragAndDropHost* drag_and_drop_host) { 222 app_list::ApplicationDragAndDropHost* drag_and_drop_host) {
219 if (view_ && is_visible_) 223 if (view_ && is_visible_)
220 view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host); 224 view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
221 } 225 }
222 226
223 void AppListController::SetView(app_list::AppListView* view) { 227 void AppListController::SetView(app_list::AppListView* view) {
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 should_snap_back_ = false; 426 should_snap_back_ = false;
423 ui::ScopedLayerAnimationSettings animation(widget_animator); 427 ui::ScopedLayerAnimationSettings animation(widget_animator);
424 animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds( 428 animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
425 app_list::kOverscrollPageTransitionDurationMs)); 429 app_list::kOverscrollPageTransitionDurationMs));
426 widget->SetBounds(view_bounds_); 430 widget->SetBounds(view_bounds_);
427 } 431 }
428 } 432 }
429 433
430 } // namespace internal 434 } // namespace internal
431 } // namespace ash 435 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698