Remove even more ATL dependencies.

chrome/browser/views/bookmark_manager_view.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/bookmark_manager_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/color_utils.h"
@@ skipping 119 matching lines @@
       return BookmarkManagerView::NONE;
   }
 }
 
 }  // namespace
 
 BookmarkManagerView::BookmarkManagerView(Profile* profile)
     : 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);
 
   table_view_ = new BookmarkTableView(profile_, NULL);
   table_view_->SetObserver(this);
   table_view_->SetContextMenuController(this);
 
   tree_view_ = new BookmarkFolderTreeView(profile_, NULL);
   tree_view_->SetController(this);
   tree_view_->SetContextMenuController(this);
@@ skipping 321 matching lines @@
                                           int y,
                                           bool is_mouse_gesture) {
   DCHECK(source == table_view_ || source == tree_view_);
   bool is_table = (source == table_view_);
   ShowMenu(GetWidget()->GetNativeView(), x, y,
            is_table ? BookmarkContextMenu::BOOKMARK_MANAGER_TABLE :
                       BookmarkContextMenu::BOOKMARK_MANAGER_TREE);
 }
 
 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
   // constants.
   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();
   }
 }
 
 void BookmarkManagerView::ExecuteCommand(int id) {
   switch (id) {
     case IDS_BOOKMARK_MANAGER_IMPORT_MENU:
       UserMetrics::RecordAction(L"BookmarkManager_Import", profile_);
       ShowImportBookmarksFileChooser();
@@ skipping 228 matching lines @@
   file_type_info.extensions.resize(1);
   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
   file_type_info.include_all_files = true;
   select_file_dialog_ = SelectFileDialog::Create(this);
   select_file_dialog_->SelectFile(
       SelectFileDialog::SELECT_SAVEAS_FILE, std::wstring(),
       FilePath(FILE_PATH_LITERAL("bookmarks.html")), &file_type_info, 0,
       L"html", GetWidget()->GetNativeView(),
       reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_EXPORT_MENU));
 }