diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 17:39:46 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 17:39:46 +0000 |
| commit | 72d1e597c85fbf6b45756e3c753696370c48c042 (patch) | |
| tree | d01609d62295e34aa3a5721d4109f815d0fd23ad /chrome/views/chrome_menu.cc | |
| parent | 9475d1d189c03a0626c4855b38f6004bfe7c5bb8 (diff) | |
| download | chromium_src-72d1e597c85fbf6b45756e3c753696370c48c042.zip chromium_src-72d1e597c85fbf6b45756e3c753696370c48c042.tar.gz chromium_src-72d1e597c85fbf6b45756e3c753696370c48c042.tar.bz2 | |
Slight code change to make some global variables const.
Fix >80 cols lines.
Review URL: http://codereview.chromium.org/42013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/chrome_menu.cc')
| -rw-r--r-- | chrome/views/chrome_menu.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc index 96b24dc..6c038a5 100644 --- a/chrome/views/chrome_menu.cc +++ b/chrome/views/chrome_menu.cc @@ -1428,7 +1428,8 @@ void MenuItemView::Paint(ChromeCanvas* canvas, bool for_drag) { height() }; gutter_bounds.right = gutter_bounds.left + gutter_width; AdjustBoundsForRTLUI(&gutter_bounds); - NativeTheme::instance()->PaintMenuGutter(dc, MENU_POPUPGUTTER, MPI_NORMAL, &gutter_bounds); + NativeTheme::instance()->PaintMenuGutter(dc, MENU_POPUPGUTTER, MPI_NORMAL, + &gutter_bounds); } // Render the background. @@ -1474,7 +1475,8 @@ void MenuItemView::Paint(ChromeCanvas* canvas, bool for_drag) { int default_sys_color = render_selection ? COLOR_HIGHLIGHTTEXT : (IsEnabled() ? COLOR_MENUTEXT : COLOR_GRAYTEXT); SkColor fg_color = NativeTheme::instance()->GetThemeColorWithDefault( - NativeTheme::MENU, MENU_POPUPITEM, state, TMT_TEXTCOLOR, default_sys_color); + NativeTheme::MENU, MENU_POPUPITEM, state, TMT_TEXTCOLOR, + default_sys_color); int width = this->width() - item_right_margin - label_start; ChromeFont& font = GetRootMenuItem()->font_; gfx::Rect text_bounds(label_start, top_margin, width, font.height()); @@ -1506,8 +1508,12 @@ void MenuItemView::Paint(ChromeCanvas* canvas, bool for_drag) { if (HasSubmenu()) { int state_id = IsEnabled() ? MSM_NORMAL : MSM_DISABLED; - RECT arrow_bounds = { this->width() - item_right_margin + kLabelToArrowPadding, - 0, 0, height() }; + RECT arrow_bounds = { + this->width() - item_right_margin + kLabelToArrowPadding, + 0, + 0, + height() + }; arrow_bounds.right = arrow_bounds.left + arrow_width; AdjustBoundsForRTLUI(&arrow_bounds); |