OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/wrench_menu.h" | 5 #include "chrome/browser/ui/views/wrench_menu.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <set> | 9 #include <set> |
10 | 10 |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "content/public/browser/notification_types.h" | 25 #include "content/public/browser/notification_types.h" |
26 #include "grit/chromium_strings.h" | 26 #include "grit/chromium_strings.h" |
27 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
28 #include "grit/theme_resources.h" | 28 #include "grit/theme_resources.h" |
29 #include "third_party/skia/include/core/SkPaint.h" | 29 #include "third_party/skia/include/core/SkPaint.h" |
30 #include "ui/base/l10n/l10n_util.h" | 30 #include "ui/base/l10n/l10n_util.h" |
31 #include "ui/base/resource/resource_bundle.h" | 31 #include "ui/base/resource/resource_bundle.h" |
32 #include "ui/gfx/canvas.h" | 32 #include "ui/gfx/canvas.h" |
33 #include "ui/gfx/canvas_skia.h" | 33 #include "ui/gfx/canvas_skia.h" |
34 #include "ui/gfx/skia_util.h" | 34 #include "ui/gfx/skia_util.h" |
| 35 #include "ui/views/background.h" |
35 #include "ui/views/controls/button/image_button.h" | 36 #include "ui/views/controls/button/image_button.h" |
36 #include "ui/views/controls/button/menu_button.h" | 37 #include "ui/views/controls/button/menu_button.h" |
37 #include "ui/views/controls/button/text_button.h" | 38 #include "ui/views/controls/button/text_button.h" |
38 #include "ui/views/controls/label.h" | 39 #include "ui/views/controls/label.h" |
39 #include "ui/views/controls/menu/menu_config.h" | 40 #include "ui/views/controls/menu/menu_config.h" |
40 #include "ui/views/controls/menu/menu_item_view.h" | 41 #include "ui/views/controls/menu/menu_item_view.h" |
41 #include "ui/views/controls/menu/menu_runner.h" | 42 #include "ui/views/controls/menu/menu_runner.h" |
42 #include "ui/views/controls/menu/menu_scroll_view_container.h" | 43 #include "ui/views/controls/menu/menu_scroll_view_container.h" |
43 #include "ui/views/controls/menu/submenu_view.h" | 44 #include "ui/views/controls/menu/submenu_view.h" |
44 #include "ui/views/widget/widget.h" | 45 #include "ui/views/widget/widget.h" |
45 #include "views/background.h" | |
46 | 46 |
47 using ui::MenuModel; | 47 using ui::MenuModel; |
48 using views::CustomButton; | 48 using views::CustomButton; |
49 using views::ImageButton; | 49 using views::ImageButton; |
50 using views::Label; | 50 using views::Label; |
51 using views::MenuConfig; | 51 using views::MenuConfig; |
52 using views::MenuItemView; | 52 using views::MenuItemView; |
53 using views::TextButton; | 53 using views::TextButton; |
54 using views::View; | 54 using views::View; |
55 | 55 |
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
890 bookmark_menu_delegate_.reset( | 890 bookmark_menu_delegate_.reset( |
891 new BookmarkMenuDelegate(browser_->profile(), | 891 new BookmarkMenuDelegate(browser_->profile(), |
892 NULL, | 892 NULL, |
893 parent, | 893 parent, |
894 first_bookmark_command_id_)); | 894 first_bookmark_command_id_)); |
895 bookmark_menu_delegate_->Init( | 895 bookmark_menu_delegate_->Init( |
896 this, bookmark_menu_, model->bookmark_bar_node(), 0, | 896 this, bookmark_menu_, model->bookmark_bar_node(), 0, |
897 BookmarkMenuDelegate::SHOW_OTHER_FOLDER, | 897 BookmarkMenuDelegate::SHOW_OTHER_FOLDER, |
898 bookmark_utils::LAUNCH_WRENCH_MENU); | 898 bookmark_utils::LAUNCH_WRENCH_MENU); |
899 } | 899 } |
OLD | NEW |