| OLD | NEW | 
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/views/infobars/extension_infobar.h" | 5 #include "chrome/browser/views/infobars/extension_infobar.h" | 
| 6 | 6 | 
| 7 #include "app/gfx/canvas.h" |  | 
| 8 #include "app/resource_bundle.h" | 7 #include "app/resource_bundle.h" | 
| 9 #include "app/slide_animation.h" | 8 #include "app/slide_animation.h" | 
| 10 #include "chrome/browser/extensions/extension_context_menu_model.h" | 9 #include "chrome/browser/extensions/extension_context_menu_model.h" | 
| 11 #include "chrome/browser/extensions/extension_infobar_delegate.h" | 10 #include "chrome/browser/extensions/extension_infobar_delegate.h" | 
| 12 #include "chrome/browser/extensions/extension_host.h" | 11 #include "chrome/browser/extensions/extension_host.h" | 
| 13 #include "chrome/browser/views/frame/browser_view.h" | 12 #include "chrome/browser/views/frame/browser_view.h" | 
| 14 #include "chrome/common/extensions/extension.h" | 13 #include "chrome/common/extensions/extension.h" | 
| 15 #include "chrome/common/platform_util.h" | 14 #include "chrome/common/platform_util.h" | 
|  | 15 #include "gfx/canvas.h" | 
| 16 #include "grit/browser_resources.h" | 16 #include "grit/browser_resources.h" | 
| 17 #include "grit/theme_resources.h" | 17 #include "grit/theme_resources.h" | 
| 18 #include "views/controls/button/menu_button.h" | 18 #include "views/controls/button/menu_button.h" | 
| 19 #include "views/controls/menu/menu_2.h" | 19 #include "views/controls/menu/menu_2.h" | 
| 20 #include "views/widget/widget.h" | 20 #include "views/widget/widget.h" | 
| 21 | 21 | 
| 22 // The horizontal margin between the menu and the Extension (HTML) view. | 22 // The horizontal margin between the menu and the Extension (HTML) view. | 
| 23 static const int kMenuHorizontalMargin = 1; | 23 static const int kMenuHorizontalMargin = 1; | 
| 24 | 24 | 
| 25 // The amount of space to the right of the Extension (HTML) view (to avoid | 25 // The amount of space to the right of the Extension (HTML) view (to avoid | 
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 143                         image_size + kDropArrowLeftMargin, | 143                         image_size + kDropArrowLeftMargin, | 
| 144                         image_size / 2); | 144                         image_size / 2); | 
| 145   menu_->SetIcon(canvas->ExtractBitmap()); | 145   menu_->SetIcon(canvas->ExtractBitmap()); | 
| 146 | 146 | 
| 147   AddChildView(menu_); | 147   AddChildView(menu_); | 
| 148 } | 148 } | 
| 149 | 149 | 
| 150 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar() { | 150 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar() { | 
| 151   return new ExtensionInfoBar(this); | 151   return new ExtensionInfoBar(this); | 
| 152 } | 152 } | 
| OLD | NEW | 
|---|