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

Side by Side Diff: chrome/browser/ui/views/wrench_menu.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | « chrome/browser/ui/views/window.cc ('k') | chrome/browser/ui/window_sizer.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) 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 <cmath> 7 #include <cmath>
8 8
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/app/chrome_command_ids.h" 11 #include "chrome/app/chrome_command_ids.h"
12 #include "chrome/browser/metrics/user_metrics.h" 12 #include "chrome/browser/metrics/user_metrics.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/tab_contents/tab_contents.h" 14 #include "chrome/browser/tab_contents/tab_contents.h"
15 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
16 #include "chrome/common/notification_observer.h" 16 #include "chrome/common/notification_observer.h"
17 #include "chrome/common/notification_registrar.h" 17 #include "chrome/common/notification_registrar.h"
18 #include "chrome/common/notification_source.h" 18 #include "chrome/common/notification_source.h"
19 #include "chrome/common/notification_type.h" 19 #include "chrome/common/notification_type.h"
20 #include "gfx/canvas.h"
21 #include "gfx/canvas_skia.h"
22 #include "gfx/skia_util.h"
23 #include "grit/chromium_strings.h" 20 #include "grit/chromium_strings.h"
24 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
25 #include "grit/theme_resources.h" 22 #include "grit/theme_resources.h"
26 #include "third_party/skia/include/core/SkPaint.h" 23 #include "third_party/skia/include/core/SkPaint.h"
27 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
28 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/gfx/canvas.h"
27 #include "ui/gfx/canvas_skia.h"
28 #include "ui/gfx/skia_util.h"
29 #include "views/background.h" 29 #include "views/background.h"
30 #include "views/controls/button/image_button.h" 30 #include "views/controls/button/image_button.h"
31 #include "views/controls/button/menu_button.h" 31 #include "views/controls/button/menu_button.h"
32 #include "views/controls/button/text_button.h" 32 #include "views/controls/button/text_button.h"
33 #include "views/controls/label.h" 33 #include "views/controls/label.h"
34 #include "views/controls/menu/menu_config.h" 34 #include "views/controls/menu/menu_config.h"
35 #include "views/controls/menu/menu_item_view.h" 35 #include "views/controls/menu/menu_item_view.h"
36 #include "views/controls/menu/menu_scroll_view_container.h" 36 #include "views/controls/menu/menu_scroll_view_container.h"
37 #include "views/controls/menu/submenu_view.h" 37 #include "views/controls/menu/submenu_view.h"
38 #include "views/window/window.h" 38 #include "views/window/window.h"
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 } 704 }
705 705
706 return menu_item; 706 return menu_item;
707 } 707 }
708 708
709 void WrenchMenu::CancelAndEvaluate(MenuModel* model, int index) { 709 void WrenchMenu::CancelAndEvaluate(MenuModel* model, int index) {
710 selected_menu_model_ = model; 710 selected_menu_model_ = model;
711 selected_index_ = index; 711 selected_index_ = index;
712 root_->Cancel(); 712 root_->Cancel();
713 } 713 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/window.cc ('k') | chrome/browser/ui/window_sizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698