// Copyright (c) 2010 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 "views/controls/menu/menu_config.h"

#include "grit/app_resources.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/resource/resource_bundle.h"

namespace views {

// static
MenuConfig* MenuConfig::Create() {
  MenuConfig* config = new MenuConfig();
  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
#if defined(TOUCH_UI)
  config->font = rb.GetFont(ResourceBundle::LargeFont);
#else
  config->font = rb.GetFont(ResourceBundle::BaseFont);
#endif
  config->arrow_width = rb.GetBitmapNamed(IDR_MENU_ARROW)->width();
  // Add 4 to force some padding between check and label.
  config->check_width = rb.GetBitmapNamed(IDR_MENU_CHECK)->width() + 4;
  config->check_height = rb.GetBitmapNamed(IDR_MENU_CHECK)->height();
  return config;
}

}  // namespace views

// Copyright (c) 2010 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 "views/controls/menu/menu_config.h"

#include "grit/app_resources.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/resource/resource_bundle.h"

namespace views {

// static
MenuConfig* MenuConfig::Create() {
  MenuConfig* config = new MenuConfig();
  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
  config->font = rb.GetFont(ResourceBundle::BaseFont);
  config->arrow_width = rb.GetBitmapNamed(IDR_MENU_ARROW)->width();
  // Add 4 to force some padding between check and label.
  config->check_width = rb.GetBitmapNamed(IDR_MENU_CHECK)->width() + 4;
  config->check_height = rb.GetBitmapNamed(IDR_MENU_CHECK)->height();
  return config;
}

}  // namespace views

--- 
+++ 
@@ -14,7 +14,11 @@
 MenuConfig* MenuConfig::Create() {
   MenuConfig* config = new MenuConfig();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+#if defined(TOUCH_UI)
+  config->font = rb.GetFont(ResourceBundle::LargeFont);
+#else
   config->font = rb.GetFont(ResourceBundle::BaseFont);
+#endif
   config->arrow_width = rb.GetBitmapNamed(IDR_MENU_ARROW)->width();
   // Add 4 to force some padding between check and label.
   config->check_width = rb.GetBitmapNamed(IDR_MENU_CHECK)->width() + 4;
Increase the base font size for touch ui


BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6519034

git-svn-id: http://src.chromium.org/svn/trunk/src@77349 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: 769188b051f6abb22b6e4a51e926b757e5fcf477