| 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/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/renderer_host/render_view_host.h" | 8 #include "chrome/browser/renderer_host/render_view_host.h" |
| 9 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 9 #include "chrome/browser/renderer_host/render_widget_host_view.h" |
| 10 #include "chrome/browser/views/extensions/extension_popup.h" | 10 #include "chrome/browser/views/extensions/extension_popup.h" |
| 11 #include "views/widget/widget.h" | 11 #include "views/widget/widget.h" |
| 12 | 12 |
| 13 #if defined(OS_WIN) | 13 #if defined(OS_WIN) |
| 14 #include "chrome/browser/renderer_host/render_widget_host_view_win.h" | 14 #include "chrome/browser/renderer_host/render_widget_host_view_win.h" |
| 15 #elif defined(TOUCH_UI) | 15 #elif defined(TOUCH_UI) |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 render_view_host()->view()->SetBackground(pending_background_); | 198 render_view_host()->view()->SetBackground(pending_background_); |
| 199 pending_background_.reset(); | 199 pending_background_.reset(); |
| 200 } | 200 } |
| 201 | 201 |
| 202 // Tell the renderer not to draw scroll bars in popups unless the | 202 // Tell the renderer not to draw scroll bars in popups unless the |
| 203 // popups are at the maximum allowed size. | 203 // popups are at the maximum allowed size. |
| 204 gfx::Size largest_popup_size(ExtensionPopup::kMaxWidth, | 204 gfx::Size largest_popup_size(ExtensionPopup::kMaxWidth, |
| 205 ExtensionPopup::kMaxHeight); | 205 ExtensionPopup::kMaxHeight); |
| 206 host_->DisableScrollbarsForSmallWindows(largest_popup_size); | 206 host_->DisableScrollbarsForSmallWindows(largest_popup_size); |
| 207 } | 207 } |
| OLD | NEW |