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

Side by Side Diff: ash/app_list/app_list.cc

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 years, 7 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/app_list/app_list.h ('k') | ash/app_list/app_list_view.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/app_list/app_list.h" 5 #include "ash/app_list/app_list.h"
6 6
7 #include "ash/app_list/app_list_view.h" 7 #include "ash/app_list/app_list_view.h"
8 #include "ash/app_list/icon_cache.h" 8 #include "ash/app_list/icon_cache.h"
9 #include "ash/shell.h"
9 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
10 #include "ash/shell.h"
11 #include "ash/shell_window_ids.h" 11 #include "ash/shell_window_ids.h"
12 #include "ash/wm/shelf_layout_manager.h" 12 #include "ash/wm/shelf_layout_manager.h"
13 #include "ash/wm/window_util.h" 13 #include "ash/wm/window_util.h"
14 #include "ui/aura/event.h" 14 #include "ui/aura/event.h"
15 #include "ui/aura/root_window.h" 15 #include "ui/aura/root_window.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/gfx/compositor/layer.h" 17 #include "ui/compositor/layer.h"
18 #include "ui/gfx/compositor/scoped_layer_animation_settings.h" 18 #include "ui/compositor/scoped_layer_animation_settings.h"
19 #include "ui/gfx/screen.h" 19 #include "ui/gfx/screen.h"
20 #include "ui/gfx/transform_util.h" 20 #include "ui/gfx/transform_util.h"
21 21
22 namespace ash { 22 namespace ash {
23 namespace internal { 23 namespace internal {
24 24
25 namespace { 25 namespace {
26 26
27 const float kContainerAnimationScaleFactor = 1.05f; 27 const float kContainerAnimationScaleFactor = 1.05f;
28 28
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 268
269 void AppList::OnWidgetClosing(views::Widget* widget) { 269 void AppList::OnWidgetClosing(views::Widget* widget) {
270 DCHECK(view_->GetWidget() == widget); 270 DCHECK(view_->GetWidget() == widget);
271 if (is_visible_) 271 if (is_visible_)
272 SetVisible(false); 272 SetVisible(false);
273 ResetView(); 273 ResetView();
274 } 274 }
275 275
276 } // namespace internal 276 } // namespace internal
277 } // namespace ash 277 } // namespace ash
OLDNEW
« no previous file with comments | « ash/app_list/app_list.h ('k') | ash/app_list/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698