chrome/browser/chrome_browser_main_posix.cc - Issue 7973003: Making TOOLKIT_USES_GTK orthogonal to USE_AURA.

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/chrome_browser_main_posix.cc

Issue 7973003: Making TOOLKIT_USES_GTK orthogonal to USE_AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge 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/chrome_browser_main_posix.cc

diff --git a/chrome/browser/chrome_browser_main_posix.cc b/chrome/browser/chrome_browser_main_posix.cc

index 518d8ecfe9c8d28438f92dc9b03753f80e2e6982..aa54aec936e05adc1fb97ac1ccdf4741b32444ab 100644

--- a/chrome/browser/chrome_browser_main_posix.cc

+++ b/chrome/browser/chrome_browser_main_posix.cc

@@ -20,7 +20,7 @@

#include "chrome/common/chrome_switches.h"

#include "content/browser/browser_thread.h"

-#if defined(TOOLKIT_USES_GTK) && !defined(OS_CHROMEOS) && !defined(USE_AURA)

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

#include "chrome/browser/printing/print_dialog_gtk.h"

#endif

@@ -255,7 +255,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopStart() {

action.sa_handler = SIGHUPHandler;

CHECK(sigaction(SIGHUP, &action, NULL) == 0);

-#if defined(TOOLKIT_USES_GTK) && !defined(OS_CHROMEOS) && !defined(USE_AURA)

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

printing::PrintingContextCairo::SetCreatePrintDialogFunction(

&PrintDialogGtk::CreatePrintDialog);

#endif

« no previous file with comments | « build/common.gypi ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »