ash/common/shelf/shelf_widget.h - 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_widget.h

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_widget.h

diff --git a/ash/shelf/shelf_widget.h b/ash/common/shelf/shelf_widget.h

similarity index 95%

rename from ash/shelf/shelf_widget.h

rename to ash/common/shelf/shelf_widget.h

index bbf8f203691e341b05cf5c7063939016ee468a3b..d87e61a0b87ddf375f4fcd03fa04d8c97c5aa029 100644

--- a/ash/shelf/shelf_widget.h

+++ b/ash/common/shelf/shelf_widget.h

@@ -2,16 +2,16 @@

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

// found in the LICENSE file.

-#ifndef ASH_SHELF_SHELF_WIDGET_H_

-#define ASH_SHELF_SHELF_WIDGET_H_

+#ifndef ASH_COMMON_SHELF_SHELF_WIDGET_H_

+#define ASH_COMMON_SHELF_SHELF_WIDGET_H_

#include <memory>

#include "ash/ash_export.h"

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

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

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

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

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

#include "base/macros.h"

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

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

@@ -135,4 +135,4 @@ class ASH_EXPORT ShelfWidget : public views::Widget,

} // namespace ash

-#endif // ASH_SHELF_SHELF_WIDGET_H_

+#endif // ASH_COMMON_SHELF_SHELF_WIDGET_H_

« no previous file with comments | « ash/common/shelf/shelf_view.cc ('k') | ash/common/shelf/shelf_widget.cc » ('j') | no next file with comments »