OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "chrome/browser/ui/views/toolbar/app_menu.h" | 5 #include "chrome/browser/ui/views/toolbar/app_menu.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <cmath> | 10 #include <cmath> |
(...skipping 27 matching lines...) Expand all Loading... |
38 #include "content/public/browser/notification_observer.h" | 38 #include "content/public/browser/notification_observer.h" |
39 #include "content/public/browser/notification_registrar.h" | 39 #include "content/public/browser/notification_registrar.h" |
40 #include "content/public/browser/notification_source.h" | 40 #include "content/public/browser/notification_source.h" |
41 #include "content/public/browser/notification_types.h" | 41 #include "content/public/browser/notification_types.h" |
42 #include "content/public/browser/user_metrics.h" | 42 #include "content/public/browser/user_metrics.h" |
43 #include "content/public/browser/web_contents.h" | 43 #include "content/public/browser/web_contents.h" |
44 #include "extensions/common/feature_switch.h" | 44 #include "extensions/common/feature_switch.h" |
45 #include "grit/theme_resources.h" | 45 #include "grit/theme_resources.h" |
46 #include "third_party/skia/include/core/SkCanvas.h" | 46 #include "third_party/skia/include/core/SkCanvas.h" |
47 #include "third_party/skia/include/core/SkPaint.h" | 47 #include "third_party/skia/include/core/SkPaint.h" |
| 48 #include "ui/accessibility/ax_enums.h" |
48 #include "ui/accessibility/ax_view_state.h" | 49 #include "ui/accessibility/ax_view_state.h" |
49 #include "ui/base/l10n/l10n_util.h" | 50 #include "ui/base/l10n/l10n_util.h" |
50 #include "ui/base/layout.h" | 51 #include "ui/base/layout.h" |
51 #include "ui/base/material_design/material_design_controller.h" | 52 #include "ui/base/material_design/material_design_controller.h" |
52 #include "ui/base/resource/resource_bundle.h" | 53 #include "ui/base/resource/resource_bundle.h" |
53 #include "ui/gfx/canvas.h" | 54 #include "ui/gfx/canvas.h" |
54 #include "ui/gfx/font_list.h" | 55 #include "ui/gfx/font_list.h" |
55 #include "ui/gfx/image/image.h" | 56 #include "ui/gfx/image/image.h" |
56 #include "ui/gfx/image/image_skia_source.h" | 57 #include "ui/gfx/image/image_skia_source.h" |
57 #include "ui/gfx/skia_util.h" | 58 #include "ui/gfx/skia_util.h" |
(...skipping 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1255 0, | 1256 0, |
1256 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS, | 1257 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS, |
1257 BOOKMARK_LAUNCH_LOCATION_APP_MENU); | 1258 BOOKMARK_LAUNCH_LOCATION_APP_MENU); |
1258 } | 1259 } |
1259 | 1260 |
1260 int AppMenu::ModelIndexFromCommandId(int command_id) const { | 1261 int AppMenu::ModelIndexFromCommandId(int command_id) const { |
1261 CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id); | 1262 CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id); |
1262 DCHECK(ix != command_id_to_entry_.end()); | 1263 DCHECK(ix != command_id_to_entry_.end()); |
1263 return ix->second.second; | 1264 return ix->second.second; |
1264 } | 1265 } |
OLD | NEW |