Commit ce65216d authored by Side Yilmaz's avatar Side Yilmaz Committed by Chromium LUCI CQ

Pass the correct profile to ToolbarButtonInProductHelpController.

This CL make ToolbarButtonInProductHelpController use the correct
profile instead of using always regular profile.

Bug: 1048632
Change-Id: Icde76cb9e023c8159b44611f943084080435a884
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2567227Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Side YILMAZ <sideyilmaz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836792}
parent a0eb4481
...@@ -19,6 +19,7 @@ import org.chromium.chrome.browser.feature_engagement.ScreenshotMonitor; ...@@ -19,6 +19,7 @@ import org.chromium.chrome.browser.feature_engagement.ScreenshotMonitor;
import org.chromium.chrome.browser.feature_engagement.ScreenshotMonitorDelegate; import org.chromium.chrome.browser.feature_engagement.ScreenshotMonitorDelegate;
import org.chromium.chrome.browser.feature_engagement.ScreenshotTabObserver; import org.chromium.chrome.browser.feature_engagement.ScreenshotTabObserver;
import org.chromium.chrome.browser.feature_engagement.TrackerFactory; import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
import org.chromium.chrome.browser.incognito.IncognitoUtils;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver; import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver;
import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings; import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
...@@ -189,10 +190,11 @@ public class ToolbarButtonInProductHelpController ...@@ -189,10 +190,11 @@ public class ToolbarButtonInProductHelpController
@Override @Override
public void onScreenshotTaken() { public void onScreenshotTaken() {
// TODO (https://crbug.com/1048632): Use the current profile (i.e., regular profile or boolean isIncognito =
// incognito profile) instead of always using regular profile. It works correctly now, but mActivity.getActivityTab() != null && mActivity.getActivityTab().isIncognito();
// it is not safe. Profile profile = IncognitoUtils.getProfileFromWindowAndroid(
Tracker tracker = TrackerFactory.getTrackerForProfile(Profile.getLastUsedRegularProfile()); mActivity.getWindowAndroid(), isIncognito);
Tracker tracker = TrackerFactory.getTrackerForProfile(profile);
tracker.notifyEvent(EventConstants.SCREENSHOT_TAKEN_CHROME_IN_FOREGROUND); tracker.notifyEvent(EventConstants.SCREENSHOT_TAKEN_CHROME_IN_FOREGROUND);
PostTask.postTask(UiThreadTaskTraits.DEFAULT, () -> { PostTask.postTask(UiThreadTaskTraits.DEFAULT, () -> {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment