chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc - Issue 2216713002: Use BookmarkModelFactory::GetForBrowserContext everywhere

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/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc

Issue 2216713002: Use BookmarkModelFactory::GetForBrowserContext everywhere (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bookmarks

Patch Set: Eliminate Profile::FromBrowserContext in some places Created 4 years, 4 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc ('k') | chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker_unittest.cc » ('j') | chrome/browser/history/android/android_history_provider_service_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc

diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc

index ac22f8d7b322e505b9c3cbf6ae1cffe5d0380ec5..879edc849995d799fbed1927d83801e32df40a24 100644

--- a/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc

+++ b/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc

@@ -11,7 +11,6 @@

#include "base/values.h"

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

#include "chrome/browser/extensions/api/declarative_content/content_constants.h"

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

#include "components/bookmarks/browser/bookmark_model.h"

#include "content/public/browser/web_contents.h"

#include "extensions/common/permissions/permissions_data.h"

@@ -130,8 +129,8 @@ UpdateState(bool request_evaluation_if_unchanged) {

bool DeclarativeContentIsBookmarkedConditionTracker::PerWebContentsTracker::

IsCurrentUrlBookmarked() {

bookmarks::BookmarkModel* bookmark_model =

- BookmarkModelFactory::GetForProfile(

- Profile::FromBrowserContext(web_contents()->GetBrowserContext()));

+ BookmarkModelFactory::GetForBrowserContext(

+ web_contents()->GetBrowserContext());

// BookmarkModel can be null during unit test execution.

return bookmark_model &&

bookmark_model->IsBookmarked(web_contents()->GetVisibleURL());

@@ -153,7 +152,7 @@ DeclarativeContentIsBookmarkedConditionTracker(content::BrowserContext* context,

extensive_bookmark_changes_in_progress_(0),

scoped_bookmarks_observer_(this) {

bookmarks::BookmarkModel* bookmark_model =

- BookmarkModelFactory::GetForProfile(Profile::FromBrowserContext(context));

+ BookmarkModelFactory::GetForBrowserContext(context);

// Can be null during unit test execution.

if (bookmark_model)

scoped_bookmarks_observer_.Add(bookmark_model);