ash/shelf/scoped_observer_with_duplicated_sources.h - Issue 23534023: ash: Minor cleanup, move more files from launcher to 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/shelf/scoped_observer_with_duplicated_sources.h

Issue 23534023: ash: Minor cleanup, move more files from launcher to shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/shelf/scoped_observer_with_duplicated_sources.h

diff --git a/ash/launcher/scoped_observer_with_duplicated_sources.h b/ash/shelf/scoped_observer_with_duplicated_sources.h

similarity index 91%

rename from ash/launcher/scoped_observer_with_duplicated_sources.h

rename to ash/shelf/scoped_observer_with_duplicated_sources.h

index 60b10f9fae82fe251265685c53f96dba7557b922..c3267128f197f0a8db27c74b9dec29f70854b76a 100644

--- a/ash/launcher/scoped_observer_with_duplicated_sources.h

+++ b/ash/shelf/scoped_observer_with_duplicated_sources.h

@@ -2,8 +2,8 @@

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

// found in the LICENSE file.

-#ifndef ASH_LAUNCHER_SCOPED_OBSERVER_WITH_DUPLICATED_SOURCES_H_

-#define ASH_LAUNCHER_SCOPED_OBSERVER_WITH_DUPLICATED_SOURCES_H_

+#ifndef ASH_SHELF_SCOPED_OBSERVER_WITH_DUPLICATED_SOURCES_H_

+#define ASH_SHELF_SCOPED_OBSERVER_WITH_DUPLICATED_SOURCES_H_

#include <map>

@@ -67,4 +67,4 @@ class ScopedObserverWithDuplicatedSources {

DISALLOW_COPY_AND_ASSIGN(ScopedObserverWithDuplicatedSources);

};

-#endif // ASH_LAUNCHER_SCOPED_OBSERVER_WITH_DUPLICATED_SOURCES_H_

+#endif // ASH_SHELF_SCOPED_OBSERVER_WITH_DUPLICATED_SOURCES_H_