chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 265813008: ozone: Fix chromeos=1 use_ozone=1 chrome build

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/chromeos/chrome_browser_main_chromeos.cc

Issue 265813008: ozone: Fix chromeos=1 use_ozone=1 chrome build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sort gyp Created 6 years, 8 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/chromeos/chrome_browser_main_chromeos.cc

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

index 3120df69cd3b1c19e2387eeeb077596315ea67c0..e434d50aa430879cd284bbfa288b9dc7beb3257f 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -30,6 +30,7 @@

#include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h"

#include "chrome/browser/chromeos/boot_times_loader.h"

#include "chrome/browser/chromeos/dbus/cros_dbus_service.h"

+#include "chrome/browser/chromeos/events/event_rewriter.h"

#include "chrome/browser/chromeos/events/event_rewriter_controller.h"

#include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"

#include "chrome/browser/chromeos/extensions/default_app_order.h"

@@ -116,7 +117,6 @@

// Exclude X11 dependents for ozone

#if defined(USE_X11)

#include "chrome/browser/chromeos/device_uma.h"

-#include "chrome/browser/chromeos/events/event_rewriter.h"

#include "chrome/browser/chromeos/events/system_key_event_listener.h"

#include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h"

#endif

« no previous file with comments | « no previous file | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »