summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2014-12-06 19:19:58 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-07 03:20:19 +0000
commit78222454fd92c13c99ff03ae6a1255e14a2e7577 (patch)
tree13fb3cfc381b7105f4be302c18f37df624ff39b6
parent624aa61a2ca75a04bd2bccba89140fbe8ec33185 (diff)
downloadchromium_src-78222454fd92c13c99ff03ae6a1255e14a2e7577.zip
chromium_src-78222454fd92c13c99ff03ae6a1255e14a2e7577.tar.gz
chromium_src-78222454fd92c13c99ff03ae6a1255e14a2e7577.tar.bz2
Cleanup: Rename another entry from 'Newtab' to 'NewTab'.
Just to be consistent with the other change we did in bookmark_bar_view.cc. This fixed the entries found in chrome/browser/ui with the following grep command: $ git grep Newtab chrome/browser/ui BUG=None R=sky@chromium.org Review URL: https://codereview.chromium.org/755623004 Cr-Commit-Position: refs/heads/master@{#307187}
-rw-r--r--chrome/browser/ui/views/detachable_toolbar_view.cc33
-rw-r--r--chrome/browser/ui/views/detachable_toolbar_view.h2
2 files changed, 21 insertions, 14 deletions
diff --git a/chrome/browser/ui/views/detachable_toolbar_view.cc b/chrome/browser/ui/views/detachable_toolbar_view.cc
index 5272d8f..872238d 100644
--- a/chrome/browser/ui/views/detachable_toolbar_view.cc
+++ b/chrome/browser/ui/views/detachable_toolbar_view.cc
@@ -14,8 +14,12 @@
#include "ui/gfx/skia_util.h"
#include "ui/views/window/non_client_view.h"
+namespace {
+
// How round the 'new tab' style bookmarks bar is.
-static const int kNewtabBarRoundness = 5;
+const int kNewTabBarRoundness = 5;
+
+} // namespace
const SkColor DetachableToolbarView::kEdgeDividerColor =
SkColorSetRGB(222, 234, 248);
@@ -51,25 +55,26 @@ void DetachableToolbarView::PaintBackgroundAttachedMode(
}
// static
-void DetachableToolbarView::CalculateContentArea(
- double animation_state, double horizontal_padding,
- double vertical_padding, SkRect* rect,
- double* roundness, views::View* view) {
+void DetachableToolbarView::CalculateContentArea(double animation_state,
+ double horizontal_padding,
+ double vertical_padding,
+ SkRect* rect,
+ double* roundness,
+ views::View* view) {
// The 0.5 is to correct for Skia's "draw on pixel boundaries"ness.
rect->set(SkDoubleToScalar(horizontal_padding - 0.5),
SkDoubleToScalar(vertical_padding - 0.5),
SkDoubleToScalar(view->width() - horizontal_padding - 0.5),
SkDoubleToScalar(view->height() - vertical_padding - 0.5));
- *roundness = static_cast<double>(kNewtabBarRoundness) * animation_state;
+ *roundness = static_cast<double>(kNewTabBarRoundness) * animation_state;
}
// static
-void DetachableToolbarView::PaintHorizontalBorder(
- gfx::Canvas* canvas,
- DetachableToolbarView* view,
- bool at_top,
- SkColor color) {
+void DetachableToolbarView::PaintHorizontalBorder(gfx::Canvas* canvas,
+ DetachableToolbarView* view,
+ bool at_top,
+ SkColor color) {
int thickness = views::NonClientFrameView::kClientEdgeThickness;
int y = at_top ? 0 : (view->height() - thickness);
canvas->FillRect(gfx::Rect(0, y, view->width(), thickness), color);
@@ -91,8 +96,10 @@ void DetachableToolbarView::PaintContentAreaBackground(
// static
void DetachableToolbarView::PaintContentAreaBorder(
- gfx::Canvas* canvas, ui::ThemeProvider* theme_provider,
- const SkRect& rect, double roundness) {
+ gfx::Canvas* canvas,
+ ui::ThemeProvider* theme_provider,
+ const SkRect& rect,
+ double roundness) {
SkPaint border_paint;
border_paint.setColor(
theme_provider->GetColor(ThemeProperties::COLOR_NTP_HEADER));
diff --git a/chrome/browser/ui/views/detachable_toolbar_view.h b/chrome/browser/ui/views/detachable_toolbar_view.h
index bdf283c..0b8d2e3 100644
--- a/chrome/browser/ui/views/detachable_toolbar_view.h
+++ b/chrome/browser/ui/views/detachable_toolbar_view.h
@@ -39,7 +39,7 @@ class DetachableToolbarView : public views::AccessiblePaneView {
ui::ThemeProvider* theme_provider,
const gfx::Rect& bounds,
const gfx::Point& background_origin,
- chrome::HostDesktopType host_desktop_type);
+ chrome::HostDesktopType host_desktop_type);
// Calculate the rect for the content area of the bar/shelf. This is only
// needed when the bar/shelf is detached from the Chrome frame (otherwise the