Move scoped_vector.h and stl_util-inl.h to base/

chrome/views/controls/menu/menu.cc

 // Copyright (c) 2006-2008 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 "chrome/views/controls/menu/menu.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlwin.h>
 #include <atlcrack.h>
 #include <atlframe.h>
 #include <atlmisc.h>
 #include <string>
 
 #include "base/gfx/rect.h"
 #include "base/logging.h"
-#include "chrome/views/accelerator.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/l10n_util_win.h"
-#include "chrome/common/stl_util-inl.h"
+#include "chrome/views/accelerator.h"
 
 const SkBitmap* Menu::Delegate::kEmptyIcon = 0;
 
 // The width of an icon, including the pixels between the icon and
 // the item label.
 static const int kIconWidth = 23;
 // Margins between the top of the item and the label.
 static const int kItemTopMargin = 3;
 // Margins between the bottom of the item and the label.
 static const int kItemBottomMargin = 4;
@@ skipping 110 matching lines @@
           reinterpret_cast<Menu::ItemData*>(lpdis->itemData);
 
       // Draw the background.
       HBRUSH hbr = CreateSolidBrush(GetBkColor(hDC));
       FillRect(hDC, &lpdis->rcItem, hbr);
       DeleteObject(hbr);
 
       // Draw the label.
       RECT rect = lpdis->rcItem;
       rect.top += kItemTopMargin;
-      // Should we add kIconWidth only when icon.width() != 0 ? 
+      // Should we add kIconWidth only when icon.width() != 0 ?
       rect.left += kItemLeftMargin + kIconWidth;
       rect.right -= kItemRightMargin;
       UINT format = DT_TOP | DT_SINGLELINE;
       // Check whether the mnemonics should be underlined.
       BOOL underline_mnemonics;
       SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &underline_mnemonics, 0);
       if (!underline_mnemonics)
         format |= DT_HIDEPREFIX;
       ChromeFont font;
       HGDIOBJ old_font = static_cast<HFONT>(SelectObject(hDC, font.hfont()));
       int fontsize = font.FontSize();
 
-      // If an accelerator is specified (with a tab delimiting the rest
-      // of the label from the accelerator), we have to justify 
-      // the fist part on the left and the accelerator on the right. 
-      // TODO(jungshik):  This will break in RTL UI. Currently, he/ar
-      // use the window system UI font and will not hit here. 
+      // If an accelerator is specified (with a tab delimiting the rest of the
+      // label from the accelerator), we have to justify the fist part on the
+      // left and the accelerator on the right.
+      // TODO(jungshik): This will break in RTL UI. Currently, he/ar use the
+      //                 window system UI font and will not hit here.
       std::wstring label = data->label;
       std::wstring accel;
       std::wstring::size_type tab_pos = label.find(L'\t');
       if (tab_pos != std::wstring::npos) {
         accel = label.substr(tab_pos);
         label = label.substr(0, tab_pos);
       }
       DrawTextEx(hDC, const_cast<wchar_t*>(label.data()),
                  static_cast<int>(label.size()), &rect, format | DT_LEFT, NULL);
       if (!accel.empty())
@@ skipping 435 matching lines @@
 }
 
 void Menu::Cancel() {
   DCHECK(is_menu_visible_);
   EndMenu();
 }
 
 int Menu::ItemCount() {
   return GetMenuItemCount(menu_);
 }