content/shell/browser/shell.h - Issue 209383003: Move wm/public into wm target

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: content/shell/browser/shell.h

Issue 209383003: Move wm/public into wm target (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 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: content/shell/browser/shell.h

diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h

index 5248199eebbe40c14d26611e0c018783f674160d..a05ac915814fe30188714cb3aeeee567b6c2e33f 100644

--- a/content/shell/browser/shell.h

+++ b/content/shell/browser/shell.h

@@ -27,8 +27,8 @@ typedef struct _GtkToolItem GtkToolItem;

#include "base/android/scoped_java_ref.h"

#elif defined(USE_AURA)

#if defined(OS_CHROMEOS)

-namespace wm {

-class WMTestHelper;

+namespace aura {

+class WindowTreeHost;

}

#endif // defined(OS_CHROMEOS)

namespace views {

@@ -264,7 +264,7 @@ class Shell : public WebContentsDelegate,

base::android::ScopedJavaGlobalRef<jobject> java_object_;

#elif defined(USE_AURA)

#if defined(OS_CHROMEOS)

- static wm::WMTestHelper* wm_test_helper_;

+ static aura::WindowTreeHost* shell_host_;

#endif

#if defined(TOOLKIT_VIEWS)

static views::ViewsDelegate* views_delegate_;

« no previous file with comments | « content/shell/DEPS ('k') | content/shell/browser/shell_platform_data_aura.cc » ('j') | no next file with comments »