chrome/browser/prefs/browser_prefs.cc - Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/

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/prefs/browser_prefs.cc

Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 10 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/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index 66d63440339e6b767fff4b180cfb053373527b80..efce02e761e9883623f0b4769fb4cf719d7e9a75 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -95,8 +95,8 @@

#include "chrome/browser/extensions/default_apps.h"

#endif

-#if defined(USE_AURA)

-#include "chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.h"

+#if defined(USE_ASH)

+#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"

#endif

namespace browser {

@@ -207,7 +207,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {

BrowserWindowGtk::RegisterUserPrefs(user_prefs);

#endif

-#if defined(USE_AURA)

+#if defined(USE_ASH)

ChromeLauncherDelegate::RegisterUserPrefs(user_prefs);

#endif

« no previous file with comments | « chrome/browser/extensions/extension_tabs_module.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »