ash/wm/gestures/system_pinch_handler.cc - Issue 115113006: Rename Launcher to Shelf.

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/wm/gestures/system_pinch_handler.cc

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more fixes Created 7 years 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

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/wm/gestures/system_pinch_handler.h"	5 #include "ash/wm/gestures/system_pinch_handler.h"

6	6

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

8 #include "ash/screen_ash.h"	7 #include "ash/screen_ash.h"

	8 #include "ash/shelf/shelf.h"

9 #include "ash/shelf/shelf_widget.h"	9 #include "ash/shelf/shelf_widget.h"

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

11 #include "ash/wm/window_animations.h"	11 #include "ash/wm/window_animations.h"

12 #include "ash/wm/window_state.h"	12 #include "ash/wm/window_state.h"

13 #include "ash/wm/window_util.h"	13 #include "ash/wm/window_util.h"

14 #include "ash/wm/workspace/snap_sizer.h"	14 #include "ash/wm/workspace/snap_sizer.h"

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

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

17 #include "ui/events/event_constants.h"	17 #include "ui/events/event_constants.h"

18 #include "ui/events/gestures/gesture_types.h"	18 #include "ui/events/gestures/gesture_types.h"

(...skipping 114 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
133 phantom_state_ = PHANTOM_WINDOW_MINIMIZED;	133 phantom_state_ = PHANTOM_WINDOW_MINIMIZED;

134 return rect;	134 return rect;

135 }	135 }

136	136

137 phantom_state_ = PHANTOM_WINDOW_NORMAL;	137 phantom_state_ = PHANTOM_WINDOW_NORMAL;

138 return window->bounds();	138 return window->bounds();

139 }	139 }

140	140

141 } // namespace internal	141 } // namespace internal

142 } // namespace ash	142 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/wm/dock/docked_window_resizer_unittest.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »