ash/launcher/launcher.cc - Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/launcher/launcher.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/drag_drop/drag_drop_controller.cc ('k') | ash/launcher/launcher_button.cc » ('j') | no next file with comments »

OLD	NEW
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.h"	5 #include "ash/launcher/launcher.h"

6	6

7 #include "ash/focus_cycler.h"	7 #include "ash/focus_cycler.h"

8 #include "ash/launcher/launcher_delegate.h"	8 #include "ash/launcher/launcher_delegate.h"

9 #include "ash/launcher/launcher_model.h"	9 #include "ash/launcher/launcher_model.h"

10 #include "ash/launcher/launcher_view.h"	10 #include "ash/launcher/launcher_view.h"

11 #include "ash/shell.h"	11 #include "ash/shell.h"

12 #include "ash/shell_delegate.h"	12 #include "ash/shell_delegate.h"

13 #include "ash/shell_window_ids.h"	13 #include "ash/shell_window_ids.h"

14 #include "ash/wm/shelf_layout_manager.h"	14 #include "ash/wm/shelf_layout_manager.h"

15 #include "ui/aura/window.h"	15 #include "ui/aura/window.h"

	16 #include "ui/compositor/layer.h"

16 #include "ui/gfx/canvas.h"	17 #include "ui/gfx/canvas.h"

17 #include "ui/gfx/compositor/layer.h"

18 #include "ui/gfx/image/image.h"	18 #include "ui/gfx/image/image.h"

19 #include "ui/views/accessible_pane_view.h"	19 #include "ui/views/accessible_pane_view.h"

20 #include "ui/views/widget/widget.h"	20 #include "ui/views/widget/widget.h"

21 #include "ui/views/widget/widget_delegate.h"	21 #include "ui/views/widget/widget_delegate.h"

22	22

23 namespace ash {	23 namespace ash {

24	24

25 namespace {	25 namespace {

26	26

27 // Max alpha of the background.	27 // Max alpha of the background.

(...skipping 173 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
201 internal::LauncherView* Launcher::GetLauncherViewForTest() {	201 internal::LauncherView* Launcher::GetLauncherViewForTest() {

202 return launcher_view_;	202 return launcher_view_;

203 }	203 }

204	204

205 void Launcher::UpdateBackground(int alpha) {	205 void Launcher::UpdateBackground(int alpha) {

206 ui::Layer* layer = widget_->GetNativeView()->layer();	206 ui::Layer* layer = widget_->GetNativeView()->layer();

207 layer->SetColor(SkColorSetARGB(alpha, 0, 0, 0));	207 layer->SetColor(SkColorSetARGB(alpha, 0, 0, 0));

208 }	208 }

209	209

210 } // namespace ash	210 } // namespace ash

OLD	NEW