Remove even more ATL dependencies.

Review URL: http://codereview.chromium.org/115309

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15965 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc
index 3975604..cb7504c 100644
--- a/chrome/browser/views/tabs/tab.cc
+++ b/chrome/browser/views/tabs/tab.cc
@@ -208,10 +208,10 @@ bool Tab::GetTooltipText(int x, int y, std::wstring* tooltip) {
   return false;
 }
 
-bool Tab::GetTooltipTextOrigin(int x, int y, CPoint* origin) {
+bool Tab::GetTooltipTextOrigin(int x, int y, gfx::Point* origin) {
   ChromeFont font;
-  origin->x = title_bounds().x() + 10;
-  origin->y = -views::TooltipManager::GetTooltipHeight() - 4;
+  origin->set_x(title_bounds().x() + 10);
+  origin->set_y(-views::TooltipManager::GetTooltipHeight() - 4);
   return true;
 }
 
diff --git a/chrome/browser/views/tabs/tab.h b/chrome/browser/views/tabs/tab.h
index ec295ed..920a849 100644
--- a/chrome/browser/views/tabs/tab.h
+++ b/chrome/browser/views/tabs/tab.h
@@ -101,7 +101,7 @@ class Tab : public TabRenderer,
   virtual void OnMouseReleased(const views::MouseEvent& event,
                                bool canceled);
   virtual bool GetTooltipText(int x, int y, std::wstring* tooltip);
-  virtual bool GetTooltipTextOrigin(int x, int y, CPoint* origin);
+  virtual bool GetTooltipTextOrigin(int x, int y, gfx::Point* origin);
   virtual std::string GetClassName() const { return kTabClassName; }
   virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
   virtual bool GetAccessibleName(std::wstring* name);
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index e7b664b..96bdd918 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <limits>
-
 #include "chrome/browser/views/tabs/tab_renderer.h"
 
+#include <limits>
+
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
 #include "app/l10n_util.h"
@@ -174,7 +174,7 @@ class TabRenderer::FavIconCrashAnimation : public Animation,
                                            public AnimationDelegate {
  public:
   explicit FavIconCrashAnimation(TabRenderer* target)
-      : Animation(1000, 25, this),
+      : ALLOW_THIS_IN_INITIALIZER_LIST(Animation(1000, 25, this)),
         target_(target) {
   }
   virtual ~FavIconCrashAnimation() {}