ash/wm/dock/docked_window_resizer.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/dock/docked_window_resizer.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 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/dock/docked_window_resizer.h"	5 #include "ash/wm/dock/docked_window_resizer.h"

6	6

7 #include "ash/display/display_controller.h"	7 #include "ash/display/display_controller.h"

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

9 #include "ash/root_window_controller.h"	8 #include "ash/root_window_controller.h"

10 #include "ash/screen_ash.h"	9 #include "ash/screen_ash.h"

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

11 #include "ash/shelf/shelf_types.h"	11 #include "ash/shelf/shelf_types.h"

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

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

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

15 #include "ash/wm/coordinate_conversion.h"	15 #include "ash/wm/coordinate_conversion.h"

16 #include "ash/wm/dock/docked_window_layout_manager.h"	16 #include "ash/wm/dock/docked_window_layout_manager.h"

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

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

19 #include "ash/wm/workspace/magnetism_matcher.h"	19 #include "ash/wm/workspace/magnetism_matcher.h"

20 #include "ash/wm/workspace/workspace_window_resizer.h"	20 #include "ash/wm/workspace/workspace_window_resizer.h"

(...skipping 307 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
328 // before.	328 // before.

329 if (is_docked_) {	329 if (is_docked_) {

330 wm::GetWindowState(window)->set_bounds_changed_by_user(	330 wm::GetWindowState(window)->set_bounds_changed_by_user(

331 was_docked_ && (is_resized \|\| was_bounds_changed_by_user_));	331 was_docked_ && (is_resized \|\| was_bounds_changed_by_user_));

332 }	332 }

333 return action;	333 return action;

334 }	334 }

335	335

336 } // namespace internal	336 } // namespace internal

337 } // namespace ash	337 } // namespace ash

OLD	NEW

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