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

Side by Side Diff: chrome/browser/ui/views/infobars/extension_infobar.cc

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/info_bubble.cc ('k') | chrome/browser/ui/views/infobars/infobars.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) 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/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "app/slide_animation.h"
9 #include "chrome/browser/extensions/extension_context_menu_model.h" 8 #include "chrome/browser/extensions/extension_context_menu_model.h"
10 #include "chrome/browser/extensions/extension_infobar_delegate.h" 9 #include "chrome/browser/extensions/extension_infobar_delegate.h"
11 #include "chrome/browser/extensions/extension_host.h" 10 #include "chrome/browser/extensions/extension_host.h"
12 #include "chrome/browser/platform_util.h" 11 #include "chrome/browser/platform_util.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/extensions/extension_icon_set.h" 14 #include "chrome/common/extensions/extension_icon_set.h"
16 #include "chrome/common/extensions/extension_resource.h" 15 #include "chrome/common/extensions/extension_resource.h"
17 #include "gfx/canvas_skia.h" 16 #include "gfx/canvas_skia.h"
18 #include "grit/theme_resources.h" 17 #include "grit/theme_resources.h"
18 #include "ui/base/animation/slide_animation.h"
19 #include "views/controls/button/menu_button.h" 19 #include "views/controls/button/menu_button.h"
20 #include "views/controls/menu/menu_2.h" 20 #include "views/controls/menu/menu_2.h"
21 #include "views/widget/widget.h" 21 #include "views/widget/widget.h"
22 22
23 // The horizontal margin between the menu and the Extension (HTML) view. 23 // The horizontal margin between the menu and the Extension (HTML) view.
24 static const int kMenuHorizontalMargin = 1; 24 static const int kMenuHorizontalMargin = 1;
25 25
26 // The amount of space to the right of the Extension (HTML) view (to avoid 26 // The amount of space to the right of the Extension (HTML) view (to avoid
27 // overlapping the close button for the InfoBar). 27 // overlapping the close button for the InfoBar).
28 static const int kFarRightMargin = 30; 28 static const int kFarRightMargin = 30;
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 Extension::EXTENSION_ICON_BITTY), 174 Extension::EXTENSION_ICON_BITTY),
175 ImageLoadingTracker::DONT_CACHE); 175 ImageLoadingTracker::DONT_CACHE);
176 } else { 176 } else {
177 OnImageLoaded(NULL, icon_resource, 0); // |image|, |index|. 177 OnImageLoaded(NULL, icon_resource, 0); // |image|, |index|.
178 } 178 }
179 } 179 }
180 180
181 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar() { 181 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar() {
182 return new ExtensionInfoBar(this); 182 return new ExtensionInfoBar(this);
183 } 183 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/info_bubble.cc ('k') | chrome/browser/ui/views/infobars/infobars.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698