chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc - Issue 205253003: [master] x11: Move X event handling out of the message-pump.

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/aura/chrome_browser_main_extra_parts_aura.cc

Issue 205253003: [master] x11: Move X event handling out of the message-pump. Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix-merge Created 6 years, 9 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/aura/chrome_browser_main_extra_parts_aura.cc

diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

index dba4955b3f235376f7e713c9382c4a18f84e392d..1688371b3793441ead5825a7a017c35aa2ff6108 100644

--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

@@ -15,6 +15,7 @@

#include "grit/generated_resources.h"

#include "ui/aura/env.h"

#include "ui/base/l10n/l10n_util.h"

+#include "ui/events/platform/platform_event_source.h"

#include "ui/gfx/screen.h"

#include "ui/views/widget/native_widget_aura.h"

@@ -68,6 +69,8 @@ void ChromeBrowserMainExtraPartsAura::PreEarlyInitialization() {

}

void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() {

+ event_source_ = ui::PlatformEventSource::CreateDefault();

#if !defined(OS_CHROMEOS)

#if defined(USE_ASH)

aura::Env::CreateInstance();