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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc

Issue 10827047: 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/views/bookmarks/bookmark_context_menu_controller_vie ws.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_vie ws.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/bookmarks/bookmark_editor.h" 9 #include "chrome/browser/bookmarks/bookmark_editor.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
11 #include "chrome/browser/bookmarks/bookmark_utils.h" 12 #include "chrome/browser/bookmarks/bookmark_utils.h"
12 #include "chrome/browser/prefs/incognito_mode_prefs.h" 13 #include "chrome/browser/prefs/incognito_mode_prefs.h"
13 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
14 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_tabstrip.h" 17 #include "chrome/browser/ui/browser_tabstrip.h"
17 #include "chrome/browser/ui/chrome_pages.h" 18 #include "chrome/browser/ui/chrome_pages.h"
18 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
19 #include "content/public/browser/page_navigator.h" 20 #include "content/public/browser/page_navigator.h"
20 #include "content/public/browser/user_metrics.h" 21 #include "content/public/browser/user_metrics.h"
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 PageNavigator* navigator, 297 PageNavigator* navigator,
297 const BookmarkNode* parent, 298 const BookmarkNode* parent,
298 const std::vector<const BookmarkNode*>& selection) 299 const std::vector<const BookmarkNode*>& selection)
299 : parent_widget_(parent_widget), 300 : parent_widget_(parent_widget),
300 delegate_(delegate), 301 delegate_(delegate),
301 browser_(browser), 302 browser_(browser),
302 profile_(profile), 303 profile_(profile),
303 navigator_(navigator), 304 navigator_(navigator),
304 parent_(parent), 305 parent_(parent),
305 selection_(selection), 306 selection_(selection),
306 model_(profile->GetBookmarkModel()) { 307 model_(BookmarkModelFactory::GetForProfile(profile)) {
307 DCHECK(profile_); 308 DCHECK(profile_);
308 DCHECK(model_->IsLoaded()); 309 DCHECK(model_->IsLoaded());
309 model_->AddObserver(this); 310 model_->AddObserver(this);
310 } 311 }
311 312
312 void BookmarkContextMenuControllerViews::BookmarkModelChanged() { 313 void BookmarkContextMenuControllerViews::BookmarkModelChanged() {
313 delegate_->CloseMenu(); 314 delegate_->CloseMenu();
314 } 315 }
315 316
316 BookmarkModel* BookmarkContextMenuControllerViews::RemoveModelObserver() { 317 BookmarkModel* BookmarkContextMenuControllerViews::RemoveModelObserver() {
317 BookmarkModel* model = model_; 318 BookmarkModel* model = model_;
318 model_->RemoveObserver(this); 319 model_->RemoveObserver(this);
319 model_ = NULL; 320 model_ = NULL;
320 return model; 321 return model;
321 } 322 }
322 323
323 bool BookmarkContextMenuControllerViews::HasURLs() const { 324 bool BookmarkContextMenuControllerViews::HasURLs() const {
324 for (size_t i = 0; i < selection_.size(); ++i) { 325 for (size_t i = 0; i < selection_.size(); ++i) {
325 if (bookmark_utils::NodeHasURLs(selection_[i])) 326 if (bookmark_utils::NodeHasURLs(selection_[i]))
326 return true; 327 return true;
327 } 328 }
328 return false; 329 return false;
329 } 330 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698