chrome/browser/ui/cocoa/browser_window_controller.mm - Issue 306293006: Introduce ChromeBookmarkClientFactory

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/cocoa/browser_window_controller.mm

Issue 306293006: Introduce ChromeBookmarkClientFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@364865

Patch Set: Rebase, remove BookmarkModelFactory::GetChromeBookmarkClientForProfile and fix unit tests Created 6 years, 6 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

« chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.h » ('j') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser_window_controller.mm

diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm

index c4ed2985d4c6ae8cf498ce928736fce0cc695056..b99b4fe9235f2978b494ca59b95b4bf04f68bc78 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm

@@ -17,6 +17,7 @@

#include "chrome/app/chrome_command_ids.h" // IDC_*

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

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

+#include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/devtools/devtools_window.h"

#include "chrome/browser/fullscreen.h"

@@ -79,6 +80,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/command.h"

#include "chrome/common/url_constants.h"

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

#include "components/signin/core/common/profile_management_switches.h"

#include "components/translate/core/browser/translate_manager.h"

#include "components/translate/core/browser/translate_ui_delegate.h"

@@ -1701,14 +1703,15 @@ using web_modal::WebContentsModalDialogManager;

- (void)showBookmarkBubbleForURL:(const GURL&)url

alreadyBookmarked:(BOOL)alreadyMarked {

if (!bookmarkBubbleController_) {

+ BookmarkModel* model =

+ BookmarkModelFactory::GetForProfile(browser_->profile());

ChromeBookmarkClient* client =

- BookmarkModelFactory::GetChromeBookmarkClientForProfile(

- browser_->profile());

- const BookmarkNode* node =

- client->model()->GetMostRecentlyAddedUserNodeForURL(url);

+ ChromeBookmarkClientFactory::GetForProfile(browser_->profile());

+ const BookmarkNode* node = model->GetMostRecentlyAddedUserNodeForURL(url);

bookmarkBubbleController_ =

[[BookmarkBubbleController alloc] initWithParentWindow:[self window]

client:client

+ model:model

node:node

alreadyBookmarked:alreadyMarked];

[bookmarkBubbleController_ showWindow:self];