Commit ab556ff1 authored by dalecurtis@google.com's avatar dalecurtis@google.com

Fix aura compile.

BUG=none
TEST=none
TBR=yefim

Review URL: https://chromiumcodereview.appspot.com/10836183

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150874 0039d316-1c4b-4281-b951-d872f2087c98
parent 8cedf7f9
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/view.h" #include "ui/views/view.h"
#if defined(OS_WIN) #if defined(OS_WIN) && !defined(USE_AURA)
// Included for MENU_POPUPITEM and a few other Windows specific constants. // Included for MENU_POPUPITEM and a few other Windows specific constants.
#include <vssym32.h> #include <vssym32.h>
#include "ui/base/native_theme/native_theme_win.h" #include "ui/base/native_theme/native_theme_win.h"
...@@ -62,7 +62,7 @@ void ActionBoxMenu::ExecuteCommand(int id) { ...@@ -62,7 +62,7 @@ void ActionBoxMenu::ExecuteCommand(int id) {
views::Border* ActionBoxMenu::CreateMenuBorder() { views::Border* ActionBoxMenu::CreateMenuBorder() {
// TODO(yefim): Use correct theme color on non-Windows. // TODO(yefim): Use correct theme color on non-Windows.
SkColor border_color = SK_ColorBLACK; SkColor border_color = SK_ColorBLACK;
#if defined(OS_WIN) #if defined(OS_WIN) && !defined(USE_AURA)
// TODO(yefim): Move to Windows only files if possible. // TODO(yefim): Move to Windows only files if possible.
border_color = ui::NativeThemeWin::instance()->GetThemeColorWithDefault( border_color = ui::NativeThemeWin::instance()->GetThemeColorWithDefault(
ui::NativeThemeWin::MENU, MENU_POPUPITEM, MPI_NORMAL, TMT_TEXTCOLOR, ui::NativeThemeWin::MENU, MENU_POPUPITEM, MPI_NORMAL, TMT_TEXTCOLOR,
...@@ -74,7 +74,7 @@ views::Border* ActionBoxMenu::CreateMenuBorder() { ...@@ -74,7 +74,7 @@ views::Border* ActionBoxMenu::CreateMenuBorder() {
views::Background* ActionBoxMenu::CreateMenuBackground() { views::Background* ActionBoxMenu::CreateMenuBackground() {
// TODO(yefim): Use correct theme color on non-Windows. // TODO(yefim): Use correct theme color on non-Windows.
SkColor background_color = SK_ColorWHITE; SkColor background_color = SK_ColorWHITE;
#if defined(OS_WIN) #if defined(OS_WIN) && !defined(USE_AURA)
// TODO(yefim): Move to Windows only files if possible. // TODO(yefim): Move to Windows only files if possible.
background_color = ui::NativeThemeWin::instance()->GetThemeColorWithDefault( background_color = ui::NativeThemeWin::instance()->GetThemeColorWithDefault(
ui::NativeThemeWin::TEXTFIELD, EP_BACKGROUND, EBS_NORMAL, ui::NativeThemeWin::TEXTFIELD, EP_BACKGROUND, EBS_NORMAL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment