ash/common/shelf/shelf_layout_manager.cc - Issue 2268823002: mash: Move more shelf files to ash/common/shelf.

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

Unified Diff: ash/common/shelf/shelf_layout_manager.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix rebase. Created 4 years, 4 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:

Index: ash/common/shelf/shelf_layout_manager.cc

diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/common/shelf/shelf_layout_manager.cc

similarity index 99%

rename from ash/shelf/shelf_layout_manager.cc

rename to ash/common/shelf/shelf_layout_manager.cc

index 12eba26d39608b21dc965457d882b06a36cfbcc1..66a9bf3f1ca4cd45507f905a2a6dfdacf7f1bdaa 100644

--- a/ash/shelf/shelf_layout_manager.cc

+++ b/ash/common/shelf/shelf_layout_manager.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "ash/shelf/shelf_layout_manager.h"

+#include "ash/common/shelf/shelf_layout_manager.h"

#include <algorithm>

#include <cmath>

@@ -10,8 +10,10 @@

#include "ash/common/material_design/material_design_controller.h"

#include "ash/common/session/session_state_delegate.h"

+#include "ash/common/shelf/shelf.h"

#include "ash/common/shelf/shelf_constants.h"

#include "ash/common/shelf/shelf_delegate.h"

+#include "ash/common/shelf/shelf_layout_manager_observer.h"

#include "ash/common/shelf/wm_shelf_util.h"

#include "ash/common/shell_window_ids.h"

#include "ash/common/system/status_area_widget.h"

@@ -24,8 +26,6 @@

#include "ash/common/wm_root_window_controller_observer.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

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

-#include "ash/shelf/shelf_layout_manager_observer.h"

#include "base/auto_reset.h"

#include "base/command_line.h"

#include "base/i18n/rtl.h"