chrome/browser/ui/views/frame/browser_view.h - Issue 10020048: Work on USE_ASH/USE_AURA split.

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: chrome/browser/ui/views/frame/browser_view.h

Issue 10020048: Work on USE_ASH/USE_AURA split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to ToT Created 8 years, 8 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: chrome/browser/ui/views/frame/browser_view.h

diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h

index f66d80b06c57f4dc90cf0b84f595de6463979a71..6d9c8fe77631499f7b9ca6b3e2ca9e330e1d2289 100644

--- a/chrome/browser/ui/views/frame/browser_view.h

+++ b/chrome/browser/ui/views/frame/browser_view.h

@@ -215,7 +215,7 @@ class BrowserView : public BrowserWindow,

move_observer_ = observer;

}

-#if defined(USE_AURA)

+#if defined(USE_ASH)

LauncherUpdater* icon_updater() const { return icon_updater_.get(); }

#endif

@@ -671,7 +671,7 @@ class BrowserView : public BrowserWindow,

scoped_ptr<AeroPeekManager> aeropeek_manager_;

#endif

-#if defined(USE_AURA)

+#if defined(USE_ASH)

scoped_ptr<LauncherUpdater> icon_updater_;

#endif