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

Side by Side Diff: ash/common/shelf/app_list_button.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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
« no previous file with comments | « ash/common/mojo_interface_factory.cc ('k') | ash/common/shelf/overflow_bubble.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/common/shelf/app_list_button.h" 5 #include "ash/common/shelf/app_list_button.h"
6 6
7 #include "ash/common/shelf/ink_drop_button_listener.h" 7 #include "ash/common/shelf/ink_drop_button_listener.h"
8 #include "ash/common/shelf/shelf_constants.h" 8 #include "ash/common/shelf/shelf_constants.h"
9 #include "ash/common/shelf/shelf_view.h" 9 #include "ash/common/shelf/shelf_view.h"
10 #include "ash/common/shelf/wm_shelf.h" 10 #include "ash/common/shelf/wm_shelf.h"
11 #include "ash/common/system/tray/tray_popup_utils.h"
12 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
13 #include "ash/public/cpp/shelf_types.h" 12 #include "ash/public/cpp/shelf_types.h"
14 #include "ash/strings/grit/ash_strings.h" 13 #include "ash/strings/grit/ash_strings.h"
14 #include "ash/system/tray/tray_popup_utils.h"
15 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
16 #include "ui/accessibility/ax_node_data.h" 16 #include "ui/accessibility/ax_node_data.h"
17 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
18 #include "ui/gfx/canvas.h" 18 #include "ui/gfx/canvas.h"
19 #include "ui/gfx/scoped_canvas.h" 19 #include "ui/gfx/scoped_canvas.h"
20 #include "ui/views/animation/flood_fill_ink_drop_ripple.h" 20 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
21 #include "ui/views/animation/ink_drop_impl.h" 21 #include "ui/views/animation/ink_drop_impl.h"
22 #include "ui/views/animation/ink_drop_mask.h" 22 #include "ui/views/animation/ink_drop_mask.h"
23 #include "ui/views/painter.h" 23 #include "ui/views/painter.h"
24 24
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 return gfx::Point(x_mid, x_mid); 207 return gfx::Point(x_mid, x_mid);
208 } else if (alignment == SHELF_ALIGNMENT_RIGHT) { 208 } else if (alignment == SHELF_ALIGNMENT_RIGHT) {
209 return gfx::Point(y_mid, y_mid); 209 return gfx::Point(y_mid, y_mid);
210 } else { 210 } else {
211 DCHECK_EQ(alignment, SHELF_ALIGNMENT_LEFT); 211 DCHECK_EQ(alignment, SHELF_ALIGNMENT_LEFT);
212 return gfx::Point(width() - y_mid, y_mid); 212 return gfx::Point(width() - y_mid, y_mid);
213 } 213 }
214 } 214 }
215 215
216 } // namespace ash 216 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/mojo_interface_factory.cc ('k') | ash/common/shelf/overflow_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698