OLD | NEW |
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 #include "chrome/browser/ui/views/browser_actions_container.h" | 5 #include "chrome/browser/ui/views/browser_actions_container.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 #include "content/public/browser/notification_source.h" | 31 #include "content/public/browser/notification_source.h" |
32 #include "content/public/browser/render_widget_host_view.h" | 32 #include "content/public/browser/render_widget_host_view.h" |
33 #include "grit/generated_resources.h" | 33 #include "grit/generated_resources.h" |
34 #include "grit/theme_resources.h" | 34 #include "grit/theme_resources.h" |
35 #include "grit/theme_resources_standard.h" | 35 #include "grit/theme_resources_standard.h" |
36 #include "grit/ui_resources.h" | 36 #include "grit/ui_resources.h" |
37 #include "third_party/skia/include/core/SkBitmap.h" | 37 #include "third_party/skia/include/core/SkBitmap.h" |
38 #include "third_party/skia/include/effects/SkGradientShader.h" | 38 #include "third_party/skia/include/effects/SkGradientShader.h" |
39 #include "ui/base/accessibility/accessible_view_state.h" | 39 #include "ui/base/accessibility/accessible_view_state.h" |
40 #include "ui/base/animation/slide_animation.h" | 40 #include "ui/base/animation/slide_animation.h" |
| 41 #include "ui/base/dragdrop/drag_utils.h" |
41 #include "ui/base/l10n/l10n_util.h" | 42 #include "ui/base/l10n/l10n_util.h" |
42 #include "ui/base/resource/resource_bundle.h" | 43 #include "ui/base/resource/resource_bundle.h" |
43 #include "ui/base/theme_provider.h" | 44 #include "ui/base/theme_provider.h" |
44 #include "ui/gfx/canvas.h" | 45 #include "ui/gfx/canvas.h" |
45 #include "ui/gfx/canvas_skia.h" | 46 #include "ui/gfx/canvas_skia.h" |
46 #include "ui/views/controls/button/menu_button.h" | 47 #include "ui/views/controls/button/menu_button.h" |
47 #include "ui/views/controls/button/text_button.h" | 48 #include "ui/views/controls/button/text_button.h" |
48 #include "ui/views/controls/menu/menu_item_view.h" | 49 #include "ui/views/controls/menu/menu_item_view.h" |
49 #include "ui/views/controls/menu/menu_model_adapter.h" | 50 #include "ui/views/controls/menu/menu_model_adapter.h" |
50 #include "ui/views/controls/menu/menu_runner.h" | 51 #include "ui/views/controls/menu/menu_runner.h" |
51 #include "ui/views/controls/resize_area.h" | 52 #include "ui/views/controls/resize_area.h" |
52 #include "ui/views/drag_utils.h" | |
53 #include "ui/views/metrics.h" | 53 #include "ui/views/metrics.h" |
54 | 54 |
55 // Horizontal spacing between most items in the container, as well as after the | 55 // Horizontal spacing between most items in the container, as well as after the |
56 // last item or chevron (if visible). | 56 // last item or chevron (if visible). |
57 static const int kItemSpacing = ToolbarView::kStandardSpacing; | 57 static const int kItemSpacing = ToolbarView::kStandardSpacing; |
58 // Horizontal spacing before the chevron (if visible). | 58 // Horizontal spacing before the chevron (if visible). |
59 static const int kChevronSpacing = kItemSpacing - 2; | 59 static const int kChevronSpacing = kItemSpacing - 2; |
60 | 60 |
61 // static | 61 // static |
62 bool BrowserActionsContainer::disable_animations_during_testing_ = false; | 62 bool BrowserActionsContainer::disable_animations_during_testing_ = false; |
(...skipping 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1120 } | 1120 } |
1121 } | 1121 } |
1122 | 1122 |
1123 bool BrowserActionsContainer::ShouldDisplayBrowserAction( | 1123 bool BrowserActionsContainer::ShouldDisplayBrowserAction( |
1124 const Extension* extension) { | 1124 const Extension* extension) { |
1125 // Only display incognito-enabled extensions while in incognito mode. | 1125 // Only display incognito-enabled extensions while in incognito mode. |
1126 return | 1126 return |
1127 (!profile_->IsOffTheRecord() || | 1127 (!profile_->IsOffTheRecord() || |
1128 profile_->GetExtensionService()->IsIncognitoEnabled(extension->id())); | 1128 profile_->GetExtensionService()->IsIncognitoEnabled(extension->id())); |
1129 } | 1129 } |
OLD | NEW |