Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Unified Diff: chrome/views/controls/menu/menu.cc

Issue 107001: Move scoped_vector.h and stl_util-inl.h to base/ (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/third_party/hunspell/src/hunspell/hashmgr.hxx ('k') | chrome/views/controls/tabbed_pane.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/views/controls/menu/menu.cc
===================================================================
--- chrome/views/controls/menu/menu.cc (revision 15263)
+++ chrome/views/controls/menu/menu.cc (working copy)
@@ -14,13 +14,13 @@
#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;
@@ -151,7 +151,7 @@
// 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;
@@ -164,11 +164,11 @@
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');
« no previous file with comments | « chrome/third_party/hunspell/src/hunspell/hashmgr.hxx ('k') | chrome/views/controls/tabbed_pane.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698