diff options
| -rw-r--r-- | chrome/browser/views/tabs/tab_strip.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_strip.h | 4 | ||||
| -rw-r--r-- | views/view.h | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 0c3d5a6..cf18449 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -1543,7 +1543,7 @@ void TabStrip::ResizeLayoutTabs() { StartResizeLayoutAnimation(); } -bool TabStrip::IsCursorInTabStripZone() { +bool TabStrip::IsCursorInTabStripZone() const { gfx::Rect bounds = GetLocalBounds(true); gfx::Point tabstrip_topleft(bounds.origin()); View::ConvertPointToScreen(this, &tabstrip_topleft); diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h index c996ba8..34d27d3 100644 --- a/chrome/browser/views/tabs/tab_strip.h +++ b/chrome/browser/views/tabs/tab_strip.h @@ -218,9 +218,7 @@ class TabStrip : public views::View, // Returns whether or not the cursor is currently in the "tab strip zone" // which is defined as the region above the TabStrip and a bit below it. - // Note: this method cannot be const because |ConvertPointToScreen| is not. - // #@*($&(#!!! - bool IsCursorInTabStripZone(); + bool IsCursorInTabStripZone() const; // Ensure that the message loop observer used for event spying is added and // removed appropriately so we can tell when to resize layout the tab strip. diff --git a/views/view.h b/views/view.h index 764cbd3..05b32ae 100644 --- a/views/view.h +++ b/views/view.h @@ -1099,7 +1099,7 @@ class View : public AcceleratorTarget { // Sets the parent View. This is called automatically by AddChild and is // thus private. - void SetParent(View *parent); + void SetParent(View* parent); // Call ViewHierarchyChanged for all child views on all parents void PropagateRemoveNotifications(View* parent); @@ -1164,7 +1164,7 @@ class View : public AcceleratorTarget { gfx::Rect bounds_; // This view's parent - View *parent_; + View* parent_; // This view's children. typedef std::vector<View*> ViewList; |