chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 1212163011: Componentize chrome/browser/rlz

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 1212163011: Componentize chrome/browser/rlz (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 5 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 32a5835a127d17b7f8ce394e35b217ec58ffdc89..143e14ea1b894c28232e4d98a2d1113235150605 100644

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

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

@@ -75,7 +75,6 @@

#include "chrome/browser/net/chrome_network_delegate.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

-#include "chrome/browser/rlz/rlz.h"

#include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

@@ -129,6 +128,10 @@

#include "ui/base/touch/touch_device.h"

#include "ui/events/event_utils.h"

+#if defined(ENABLE_RLZ)

+#include "components/rlz/rlz_tracker.h"

+#endif

// Exclude X11 dependents for ozone

#if defined(USE_X11)

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