ash/shelf/shelf_controller.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

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/shelf/shelf_controller.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)

Patch Set: Created 3 years, 9 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/shelf/shelf_controller.cc

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

similarity index 97%

rename from ash/common/shelf/shelf_controller.cc

rename to ash/shelf/shelf_controller.cc

index 5bfece459d04d7b7e138ee7374678e1b1f0fcf3c..f76ed4b645e7eb24fd5ea6c4766ecaac8e18a8cc 100644

--- a/ash/common/shelf/shelf_controller.cc

+++ b/ash/shelf/shelf_controller.cc

@@ -2,14 +2,14 @@

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

// found in the LICENSE file.

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

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

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

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

-#include "ash/common/wm_shell.h"

-#include "ash/common/wm_window.h"

#include "ash/root_window_controller.h"

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

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

#include "ash/shell.h"

+#include "ash/wm_shell.h"

+#include "ash/wm_window.h"

#include "base/strings/utf_string_conversions.h"

#include "ui/base/models/simple_menu_model.h"

#include "ui/base/resource/resource_bundle.h"

« no previous file with comments | « ash/shelf/shelf_controller.h ('k') | ash/shelf/shelf_delegate.h » ('j') | no next file with comments »