ash/shell.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/shell.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/magnifier/magnification_controller.cc ('k') | ash/shell/content_client/shell_browser_main_parts.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/shell.h"	5 #include "ash/shell.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "ash/app_list/app_list.h"	9 #include "ash/app_list/app_list.h"

10 #include "ash/ash_switches.h"	10 #include "ash/ash_switches.h"

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 #include "grit/ui_resources.h"	63 #include "grit/ui_resources.h"

64 #include "third_party/skia/include/core/SkBitmap.h"	64 #include "third_party/skia/include/core/SkBitmap.h"

65 #include "ui/aura/client/aura_constants.h"	65 #include "ui/aura/client/aura_constants.h"

66 #include "ui/aura/env.h"	66 #include "ui/aura/env.h"

67 #include "ui/aura/layout_manager.h"	67 #include "ui/aura/layout_manager.h"

68 #include "ui/aura/monitor_manager.h"	68 #include "ui/aura/monitor_manager.h"

69 #include "ui/aura/monitor_manager.h"	69 #include "ui/aura/monitor_manager.h"

70 #include "ui/aura/root_window.h"	70 #include "ui/aura/root_window.h"

71 #include "ui/aura/ui_controls_aura.h"	71 #include "ui/aura/ui_controls_aura.h"

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

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

74 #include "ui/gfx/compositor/layer_animator.h"	74 #include "ui/compositor/layer_animator.h"

75 #include "ui/gfx/monitor.h"	75 #include "ui/gfx/monitor.h"

76 #include "ui/gfx/screen.h"	76 #include "ui/gfx/screen.h"

77 #include "ui/gfx/size.h"	77 #include "ui/gfx/size.h"

78 #include "ui/ui_controls/ui_controls.h"	78 #include "ui/ui_controls/ui_controls.h"

79 #include "ui/views/widget/native_widget_aura.h"	79 #include "ui/views/widget/native_widget_aura.h"

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

81	81

82 #if !defined(OS_MACOSX)	82 #if !defined(OS_MACOSX)

83 #include "ash/accelerators/accelerator_controller.h"	83 #include "ash/accelerators/accelerator_controller.h"

84 #include "ash/accelerators/accelerator_filter.h"	84 #include "ash/accelerators/accelerator_filter.h"

(...skipping 843 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
928 panel_container->SetLayoutManager(panel_layout_manager_);	928 panel_container->SetLayoutManager(panel_layout_manager_);

929 }	929 }

930 }	930 }

931	931

932 void Shell::DisableWorkspaceGridLayout() {	932 void Shell::DisableWorkspaceGridLayout() {

933 if (workspace_controller_.get())	933 if (workspace_controller_.get())

934 workspace_controller_->workspace_manager()->set_grid_size(0);	934 workspace_controller_->workspace_manager()->set_grid_size(0);

935 }	935 }

936	936

937 } // namespace ash	937 } // namespace ash

OLD	NEW