OLD | NEW |
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/extensions/extension_view.h" | 5 #include "chrome/browser/ui/views/extensions/extension_view.h" |
6 | 6 |
7 #include "chrome/browser/extensions/extension_host.h" | 7 #include "chrome/browser/extensions/extension_host.h" |
8 #include "chrome/browser/ui/views/extensions/extension_popup.h" | 8 #include "chrome/browser/ui/views/extensions/extension_popup.h" |
9 #include "content/browser/content_browser_client.h" | |
10 #include "content/browser/renderer_host/render_view_host.h" | 9 #include "content/browser/renderer_host/render_view_host.h" |
11 #include "content/browser/renderer_host/render_widget_host_view.h" | 10 #include "content/browser/renderer_host/render_widget_host_view.h" |
| 11 #include "content/public/browser/content_browser_client.h" |
12 #include "views/widget/widget.h" | 12 #include "views/widget/widget.h" |
13 | 13 |
14 #if defined(OS_WIN) | 14 #if defined(OS_WIN) |
15 #include "content/browser/renderer_host/render_widget_host_view_win.h" | 15 #include "content/browser/renderer_host/render_widget_host_view_win.h" |
16 #elif defined(TOUCH_UI) || defined(USE_AURA) | 16 #elif defined(TOUCH_UI) || defined(USE_AURA) |
17 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" | 17 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" |
18 #elif defined(TOOLKIT_USES_GTK) | 18 #elif defined(TOOLKIT_USES_GTK) |
19 #include "content/browser/renderer_host/render_widget_host_view_gtk.h" | 19 #include "content/browser/renderer_host/render_widget_host_view_gtk.h" |
20 #endif | 20 #endif |
21 | 21 |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 render_view_host()->view()->SetBackground(pending_background_); | 206 render_view_host()->view()->SetBackground(pending_background_); |
207 pending_background_.reset(); | 207 pending_background_.reset(); |
208 } | 208 } |
209 | 209 |
210 // Tell the renderer not to draw scroll bars in popups unless the | 210 // Tell the renderer not to draw scroll bars in popups unless the |
211 // popups are at the maximum allowed size. | 211 // popups are at the maximum allowed size. |
212 gfx::Size largest_popup_size(ExtensionPopup::kMaxWidth, | 212 gfx::Size largest_popup_size(ExtensionPopup::kMaxWidth, |
213 ExtensionPopup::kMaxHeight); | 213 ExtensionPopup::kMaxHeight); |
214 host_->DisableScrollbarsForSmallWindows(largest_popup_size); | 214 host_->DisableScrollbarsForSmallWindows(largest_popup_size); |
215 } | 215 } |
OLD | NEW |