summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-04 05:05:48 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-04 05:05:48 +0000
commita3406979cd56b42ec58244e6382ca77c2c93205d (patch)
tree76d2c688df49a6d3dc3d182c86b15ffe5ba9cf8e /chrome/browser/extensions
parent1111563020b92fc9f6943e0b5c00f66de2f57082 (diff)
downloadchromium_src-a3406979cd56b42ec58244e6382ca77c2c93205d.zip
chromium_src-a3406979cd56b42ec58244e6382ca77c2c93205d.tar.gz
chromium_src-a3406979cd56b42ec58244e6382ca77c2c93205d.tar.bz2
Attempt 2 at:
Gets find bar animation/clipping to work on views/gtk. The only difference between this and the first version is fixing an include in extension_host that was triggering mac to build views, as well as an extraneous SetSlideDuration I had used for testing. BUG=none TEST=none TBR=ben Review URL: http://codereview.chromium.org/342116 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30942 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_host.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 9435913..a468700 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -25,9 +25,6 @@
#include "chrome/browser/renderer_host/render_widget_host.h"
#include "chrome/browser/renderer_host/render_widget_host_view.h"
#include "chrome/browser/renderer_host/site_instance.h"
-#if defined(TOOLKIT_VIEWS)
-#include "chrome/browser/views/extensions/extension_popup.h"
-#endif
#include "chrome/common/bindings_policy.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/notification_service.h"
@@ -37,9 +34,13 @@
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
#include "grit/browser_resources.h"
-#include "views/widget/widget.h"
#include "webkit/glue/context_menu.h"
+#if defined(TOOLKIT_VIEWS)
+#include "chrome/browser/views/extensions/extension_popup.h"
+#include "views/widget/widget.h"
+#endif
+
using WebKit::WebDragOperation;
using WebKit::WebDragOperationsMask;