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

Side by Side Diff: ash/launcher/launcher_button.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/launcher/launcher.cc ('k') | ash/launcher/launcher_context_menu_unittest.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_button.h" 5 #include "ash/launcher/launcher_button.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/launcher/launcher_button_host.h" 9 #include "ash/launcher/launcher_button_host.h"
10 #include "grit/ui_resources.h" 10 #include "grit/ui_resources.h"
11 #include "ui/base/accessibility/accessible_view_state.h" 11 #include "ui/base/accessibility/accessible_view_state.h"
12 #include "ui/base/resource/resource_bundle.h"
13 #include "ui/compositor/layer.h"
14 #include "ui/compositor/scoped_layer_animation_settings.h"
12 #include "ui/gfx/canvas.h" 15 #include "ui/gfx/canvas.h"
13 #include "ui/gfx/compositor/layer.h"
14 #include "ui/gfx/compositor/scoped_layer_animation_settings.h"
15 #include "ui/gfx/image/image.h" 16 #include "ui/gfx/image/image.h"
16 #include "ui/gfx/skbitmap_operations.h" 17 #include "ui/gfx/skbitmap_operations.h"
17 #include "ui/base/resource/resource_bundle.h"
18 #include "ui/views/controls/image_view.h" 18 #include "ui/views/controls/image_view.h"
19 19
20 namespace { 20 namespace {
21 const int kBarHeight = 3; 21 const int kBarHeight = 3;
22 const int kBarSpacing = 5; 22 const int kBarSpacing = 5;
23 const int kIconHeight = 32; 23 const int kIconHeight = 32;
24 const int kIconWidth = 48; 24 const int kIconWidth = 48;
25 const int kHopSpacing = 2; 25 const int kHopSpacing = 2;
26 const int kActiveBarColor = 0xe6ffffff; 26 const int kActiveBarColor = 0xe6ffffff;
27 const int kInactiveBarColor = 0x80ffffff; 27 const int kInactiveBarColor = 0x80ffffff;
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 bar_id = IDR_AURA_LAUNCHER_UNDERLINE_RUNNING; 265 bar_id = IDR_AURA_LAUNCHER_UNDERLINE_RUNNING;
266 266
267 bar_->SetImage(rb.GetImageNamed(bar_id).ToSkBitmap()); 267 bar_->SetImage(rb.GetImageNamed(bar_id).ToSkBitmap());
268 } 268 }
269 269
270 Layout(); 270 Layout();
271 SchedulePaint(); 271 SchedulePaint();
272 } 272 }
273 } // namespace internal 273 } // namespace internal
274 } // namespace ash 274 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/launcher.cc ('k') | ash/launcher/launcher_context_menu_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698