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

Unified Diff: chrome/browser/views/bookmark_manager_view.cc

Issue 115309: Remove even more ATL dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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/views/bookmark_manager_view.h ('k') | chrome/browser/views/bookmark_menu_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/bookmark_manager_view.cc
===================================================================
--- chrome/browser/views/bookmark_manager_view.cc (revision 16052)
+++ chrome/browser/views/bookmark_manager_view.cc (working copy)
@@ -137,7 +137,7 @@
: profile_(profile->GetOriginalProfile()),
table_view_(NULL),
tree_view_(NULL),
- search_factory_(this) {
+ ALLOW_THIS_IN_INITIALIZER_LIST(search_factory_(this)) {
search_tf_ = new views::TextField();
search_tf_->set_default_width_in_chars(30);
@@ -479,7 +479,7 @@
}
void BookmarkManagerView::RunMenu(views::View* source,
- const CPoint& pt,
+ const gfx::Point& pt,
HWND hwnd) {
// TODO(glen): when you change the buttons around and what not, futz with
// this to make it look good. If you end up keeping padding numbers make them
@@ -487,14 +487,14 @@
if (!GetBookmarkModel()->IsLoaded())
return;
- int menu_x = pt.x;
+ int menu_x = pt.x();
menu_x += UILayoutIsRightToLeft() ? (source->width() - 5) :
(-source->width() + 5);
if (source->GetID() == kOrganizeMenuButtonID) {
- ShowMenu(hwnd, menu_x, pt.y + 2,
+ ShowMenu(hwnd, menu_x, pt.y() + 2,
BookmarkContextMenu::BOOKMARK_MANAGER_ORGANIZE_MENU);
} else if (source->GetID() == kToolsMenuButtonID) {
- ShowToolsMenu(hwnd, menu_x, pt.y + 2);
+ ShowToolsMenu(hwnd, menu_x, pt.y() + 2);
} else {
NOTREACHED();
}
« no previous file with comments | « chrome/browser/views/bookmark_manager_view.h ('k') | chrome/browser/views/bookmark_menu_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698