| Index: ui/views/controls/menu/menu_separator_win.cc
|
| diff --git a/ui/views/controls/menu/menu_separator_win.cc b/ui/views/controls/menu/menu_separator_win.cc
|
| deleted file mode 100644
|
| index 98a70baa6711c8573d18b8e5df5daaab45d50602..0000000000000000000000000000000000000000
|
| --- a/ui/views/controls/menu/menu_separator_win.cc
|
| +++ /dev/null
|
| @@ -1,60 +0,0 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "ui/views/controls/menu/menu_separator.h"
|
| -
|
| -#include <windows.h>
|
| -#include <uxtheme.h>
|
| -#include <Vssym32.h>
|
| -
|
| -#include "ui/gfx/canvas.h"
|
| -#include "ui/gfx/rect.h"
|
| -#include "ui/gfx/win/dpi.h"
|
| -#include "ui/native_theme/native_theme.h"
|
| -#include "ui/native_theme/native_theme_aura.h"
|
| -#include "ui/views/controls/menu/menu_config.h"
|
| -#include "ui/views/controls/menu/menu_item_view.h"
|
| -
|
| -namespace views {
|
| -
|
| -void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
|
| - const MenuConfig& config = parent_menu_item_->GetMenuConfig();
|
| -
|
| - if (config.native_theme == ui::NativeThemeAura::instance()) {
|
| - OnPaintAura(canvas);
|
| - return;
|
| - }
|
| -
|
| - gfx::Rect separator_bounds = GetPaintBounds();
|
| - if (config.render_gutter) {
|
| - // If render_gutter is true, we're on Vista and need to render the
|
| - // gutter, then indent the separator from the gutter.
|
| - gfx::Rect gutter_bounds(MenuItemView::label_start() -
|
| - config.gutter_to_label - config.gutter_width, 0,
|
| - config.gutter_width, height());
|
| - ui::NativeTheme::ExtraParams extra;
|
| - config.native_theme->Paint(
|
| - canvas->sk_canvas(), ui::NativeTheme::kMenuPopupGutter,
|
| - ui::NativeTheme::kNormal, gutter_bounds, extra);
|
| - separator_bounds.set_x(gutter_bounds.x() + config.gutter_width);
|
| - }
|
| -
|
| - ui::NativeTheme::ExtraParams extra;
|
| - extra.menu_separator.has_gutter = config.render_gutter;
|
| -
|
| - // Hack to get the separator to display correctly on Windows where we may
|
| - // have fractional scales. We move the separator 1 pixel down to ensure that
|
| - // it falls within the clipping rect which is scaled up.
|
| - float device_scale = gfx::win::GetDeviceScaleFactor();
|
| - bool is_fractional_scale =
|
| - (device_scale - static_cast<int>(device_scale) != 0);
|
| - if (is_fractional_scale && separator_bounds.y() == 0)
|
| - separator_bounds.set_y(1);
|
| -
|
| - config.native_theme->Paint(
|
| - canvas->sk_canvas(), ui::NativeTheme::kMenuPopupSeparator,
|
| - ui::NativeTheme::kNormal, separator_bounds, extra);
|
| -}
|
| -
|
| -} // namespace views
|
|
|