chrome/browser/chrome_browser_main.cc - Issue 7942004: Consolidate/cleanup event cracking code; single out GdkEvents.

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

Issue 7942004: Consolidate/cleanup event cracking code; single out GdkEvents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge removal of compact nav. 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.cc

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

index 8e6dd57988fb649ee2536ff7c5bccca89f531b8b..334957ec13b937c707ce2f1c3954932aebcf4918 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -191,7 +191,7 @@

#endif

#if defined(TOUCH_UI)

-#include "views/touchui/touch_factory.h"

+#include "ui/base/touch/touch_factory.h"

#endif

#if defined(USE_AURA)

@@ -1753,7 +1753,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunInternal() {

#endif

#if defined(TOUCH_UI)

- views::TouchFactory::GetInstance()->set_keep_mouse_cursor(

+ ui::TouchFactory::GetInstance()->set_keep_mouse_cursor(

CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepMouseCursor));

#endif

« no previous file with comments | « no previous file | chrome/browser/chromeos/frame/panel_controller.cc » ('j') | no next file with comments »