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

Side by Side Diff: chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc

Issue 10827045: 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, 5 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/gtk/bookmarks/bookmark_menu_controller_gtk.h" 5 #include "chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/bookmarks/bookmark_model.h" 11 #include "chrome/browser/bookmarks/bookmark_model.h"
12 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
12 #include "chrome/browser/bookmarks/bookmark_utils.h" 13 #include "chrome/browser/bookmarks/bookmark_utils.h"
13 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" 16 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
16 #include "chrome/browser/ui/gtk/event_utils.h" 17 #include "chrome/browser/ui/gtk/event_utils.h"
17 #include "chrome/browser/ui/gtk/gtk_chrome_button.h" 18 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
18 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 19 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
19 #include "chrome/browser/ui/gtk/gtk_util.h" 20 #include "chrome/browser/ui/gtk/gtk_util.h"
20 #include "chrome/browser/ui/gtk/menu_gtk.h" 21 #include "chrome/browser/ui/gtk/menu_gtk.h"
21 #include "content/public/browser/page_navigator.h" 22 #include "content/public/browser/page_navigator.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 } // namespace 68 } // namespace
68 69
69 BookmarkMenuController::BookmarkMenuController(Browser* browser, 70 BookmarkMenuController::BookmarkMenuController(Browser* browser,
70 PageNavigator* navigator, 71 PageNavigator* navigator,
71 GtkWindow* window, 72 GtkWindow* window,
72 const BookmarkNode* node, 73 const BookmarkNode* node,
73 int start_child_index) 74 int start_child_index)
74 : browser_(browser), 75 : browser_(browser),
75 page_navigator_(navigator), 76 page_navigator_(navigator),
76 parent_window_(window), 77 parent_window_(window),
77 model_(browser->profile()->GetBookmarkModel()), 78 model_(BookmarkModelFactory::GetForProfile(browser->profile())),
78 node_(node), 79 node_(node),
79 drag_icon_(NULL), 80 drag_icon_(NULL),
80 ignore_button_release_(false), 81 ignore_button_release_(false),
81 triggering_widget_(NULL) { 82 triggering_widget_(NULL) {
82 menu_ = gtk_menu_new(); 83 menu_ = gtk_menu_new();
83 g_object_ref_sink(menu_); 84 g_object_ref_sink(menu_);
84 BuildMenu(node, start_child_index, menu_); 85 BuildMenu(node, start_child_index, menu_);
85 signals_.Connect(menu_, "hide", G_CALLBACK(OnMenuHiddenThunk), this); 86 signals_.Connect(menu_, "hide", G_CALLBACK(OnMenuHiddenThunk), this);
86 gtk_widget_show_all(menu_); 87 gtk_widget_show_all(menu_);
87 } 88 }
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 } 363 }
363 364
364 void BookmarkMenuController::OnMenuItemDragGet( 365 void BookmarkMenuController::OnMenuItemDragGet(
365 GtkWidget* widget, GdkDragContext* context, 366 GtkWidget* widget, GdkDragContext* context,
366 GtkSelectionData* selection_data, 367 GtkSelectionData* selection_data,
367 guint target_type, guint time) { 368 guint target_type, guint time) {
368 const BookmarkNode* node = bookmark_utils::BookmarkNodeForWidget(widget); 369 const BookmarkNode* node = bookmark_utils::BookmarkNodeForWidget(widget);
369 bookmark_utils::WriteBookmarkToSelection(node, selection_data, target_type, 370 bookmark_utils::WriteBookmarkToSelection(node, selection_data, target_type,
370 browser_->profile()); 371 browser_->profile());
371 } 372 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698