diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-17 22:25:33 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-17 22:25:33 +0000 |
| commit | 6f3bb6ca5a2e423fc9dda71c164c7e8ae2a8eae7 (patch) | |
| tree | 4ce1316dbfd179681bdff905a7d71f1b4cbb902c /chrome/browser/views/info_bubble.cc | |
| parent | 4c45708be10906e3cdbe9d40d206cfd3fcbaf1c2 (diff) | |
| download | chromium_src-6f3bb6ca5a2e423fc9dda71c164c7e8ae2a8eae7.zip chromium_src-6f3bb6ca5a2e423fc9dda71c164c7e8ae2a8eae7.tar.gz chromium_src-6f3bb6ca5a2e423fc9dda71c164c7e8ae2a8eae7.tar.bz2 | |
Rename legacy methods that were in CamelCase to unix_hacker.
Required going through and modifying some of the code to
solve name clashes.
Review URL: http://codereview.chromium.org/2945
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/info_bubble.cc')
| -rw-r--r-- | chrome/browser/views/info_bubble.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 1a6dbca..0b6f3d6 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -251,15 +251,15 @@ void InfoBubble::ContentView::Layout() { View* content = GetChildViewAt(0); int x = kBorderSize; int y = kBorderSize; - int width = GetWidth() - kBorderSize - kBorderSize - + int content_width = width() - kBorderSize - kBorderSize - kInfoBubbleViewLeftMargin - kInfoBubbleViewRightMargin; - int height = GetHeight() - kBorderSize - kBorderSize - kArrowSize - + int content_height = height() - kBorderSize - kBorderSize - kArrowSize - kInfoBubbleViewTopMargin - kInfoBubbleViewBottomMargin; if (IsTop()) y += kArrowSize; x += kInfoBubbleViewLeftMargin; y += kInfoBubbleViewTopMargin; - content->SetBounds(x, y, width, height); + content->SetBounds(x, y, content_width, content_height); } HRGN InfoBubble::ContentView::GetMask(const CSize &size) { @@ -327,8 +327,8 @@ HRGN InfoBubble::ContentView::GetMask(const CSize &size) { void InfoBubble::ContentView::Paint(ChromeCanvas* canvas) { int bubble_x = 0; int bubble_y = 0; - int bubble_w = GetWidth(); - int bubble_h = GetHeight() - kArrowSize; + int bubble_w = width(); + int bubble_h = height() - kArrowSize; int border_w = bubble_w - 2 * kInfoBubbleCornerWidth; int border_h = bubble_h - 2 * kInfoBubbleCornerHeight; @@ -368,7 +368,7 @@ void InfoBubble::ContentView::Paint(ChromeCanvas* canvas) { // Right border. canvas->DrawRectInt(kBorderColor1, - GetWidth() - 1, bubble_y + kInfoBubbleCornerHeight, + width() - 1, bubble_y + kInfoBubbleCornerHeight, 0, border_h); // Draw the corners. @@ -382,7 +382,7 @@ void InfoBubble::ContentView::Paint(ChromeCanvas* canvas) { bubble_y + bubble_h - kInfoBubbleCornerHeight); // Draw the arrow and the notch of the arrow. - int arrow_x = IsLeft() ? kArrowXOffset : GetWidth() - kArrowXOffset; + int arrow_x = IsLeft() ? kArrowXOffset : width() - kArrowXOffset; int arrow_y = IsTop() ? bubble_y : bubble_y + bubble_h - 1; const int arrow_delta = IsTop() ? -1 : 1; for (int i = 0, y = arrow_y; i <= kArrowSize; ++i, y += arrow_delta) { |