chrome/browser/profiles/profile.cc - Issue 7850026: Aura under Linux

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/profiles/profile.cc

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: First version that links (and crashes) Created 9 years, 3 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/profiles/profile.cc

diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc

index 22d1e85f85cbd82838c7fe553aa499e6613436a0..53de92764ea21971c9562dfe1db878904f63cf10 100644

--- a/chrome/browser/profiles/profile.cc

+++ b/chrome/browser/profiles/profile.cc

@@ -62,7 +62,7 @@

#include "webkit/database/database_tracker.h"

#include "webkit/quota/quota_manager.h"

-#if defined(TOOLKIT_USES_GTK)

+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)

#include "chrome/browser/ui/gtk/gtk_theme_service.h"

#endif

@@ -145,7 +145,7 @@ void Profile::RegisterUserPrefs(PrefService* prefs) {

prefs->RegisterBooleanPref(prefs::kSpeechInputCensorResults,

true,

PrefService::UNSYNCABLE_PREF);

-#if defined(TOOLKIT_USES_GTK)

+#if defined(TOOLKIT_USES_GTK) & !defined(USE_AURA)

prefs->RegisterBooleanPref(prefs::kUsesSystemTheme,

GtkThemeService::DefaultUsesSystemTheme(),

PrefService::UNSYNCABLE_PREF);