Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: chrome/browser/ui/bookmarks/bookmark_tab_helper.cc

Issue 10831062: Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" 5 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
6 6
7 #include "chrome/browser/bookmarks/bookmark_model.h" 7 #include "chrome/browser/bookmarks/bookmark_model.h"
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
8 #include "chrome/browser/bookmarks/bookmark_node_data.h" 9 #include "chrome/browser/bookmarks/bookmark_node_data.h"
9 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" 11 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
11 #include "chrome/browser/ui/tab_contents/tab_contents.h" 12 #include "chrome/browser/ui/tab_contents/tab_contents.h"
12 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 13 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
13 #include "chrome/common/chrome_notification_types.h" 14 #include "chrome/common/chrome_notification_types.h"
14 #include "content/public/browser/navigation_controller.h" 15 #include "content/public/browser/navigation_controller.h"
15 #include "content/public/browser/notification_service.h" 16 #include "content/public/browser/notification_service.h"
16 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
17 18
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 } 99 }
99 100
100 BookmarkTabHelper::BookmarkDrag* 101 BookmarkTabHelper::BookmarkDrag*
101 BookmarkTabHelper::GetBookmarkDragDelegate() { 102 BookmarkTabHelper::GetBookmarkDragDelegate() {
102 return bookmark_drag_; 103 return bookmark_drag_;
103 } 104 }
104 105
105 void BookmarkTabHelper::UpdateStarredStateForCurrentURL() { 106 void BookmarkTabHelper::UpdateStarredStateForCurrentURL() {
106 Profile* profile = 107 Profile* profile =
107 Profile::FromBrowserContext(web_contents()->GetBrowserContext()); 108 Profile::FromBrowserContext(web_contents()->GetBrowserContext());
108 BookmarkModel* model = profile->GetBookmarkModel(); 109 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
109 const bool old_state = is_starred_; 110 const bool old_state = is_starred_;
110 is_starred_ = (model && model->IsBookmarked(web_contents()->GetURL())); 111 is_starred_ = (model && model->IsBookmarked(web_contents()->GetURL()));
111 112
112 if (is_starred_ != old_state && delegate()) 113 if (is_starred_ != old_state && delegate())
113 delegate()->URLStarredChanged(tab_contents_, is_starred_); 114 delegate()->URLStarredChanged(tab_contents_, is_starred_);
114 } 115 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698