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

Side by Side Diff: ui/base/models/menu_model.h

Issue 16431009: Use a direct include of strings headers in ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/base/models/list_selection_model_unittest.cc ('k') | ui/base/models/simple_menu_model.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_BASE_MODELS_MENU_MODEL_H_ 5 #ifndef UI_BASE_MODELS_MENU_MODEL_H_
6 #define UI_BASE_MODELS_MENU_MODEL_H_ 6 #define UI_BASE_MODELS_MENU_MODEL_H_
7 7
8 #include "base/string16.h" 8 #include "base/strings/string16.h"
9 #include "ui/base/models/menu_model_delegate.h" 9 #include "ui/base/models/menu_model_delegate.h"
10 #include "ui/base/models/menu_separator_types.h" 10 #include "ui/base/models/menu_separator_types.h"
11 #include "ui/base/ui_export.h" 11 #include "ui/base/ui_export.h"
12 #include "ui/gfx/image/image_skia.h" 12 #include "ui/gfx/image/image_skia.h"
13 #include "ui/gfx/native_widget_types.h" 13 #include "ui/gfx/native_widget_types.h"
14 14
15 15
16 namespace gfx { 16 namespace gfx {
17 class Font; 17 class Font;
18 class Image; 18 class Image;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 // true if an item with the specified command id is found. |model| is inout, 132 // true if an item with the specified command id is found. |model| is inout,
133 // and specifies the model to start searching from. 133 // and specifies the model to start searching from.
134 static bool GetModelAndIndexForCommandId(int command_id, 134 static bool GetModelAndIndexForCommandId(int command_id,
135 MenuModel** model, 135 MenuModel** model,
136 int* index); 136 int* index);
137 }; 137 };
138 138
139 } // namespace ui 139 } // namespace ui
140 140
141 #endif // UI_BASE_MODELS_MENU_MODEL_H_ 141 #endif // UI_BASE_MODELS_MENU_MODEL_H_
OLDNEW
« no previous file with comments | « ui/base/models/list_selection_model_unittest.cc ('k') | ui/base/models/simple_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698