diff options
author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 00:19:04 +0000 |
---|---|---|
committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 00:19:04 +0000 |
commit | 736d1898191dc530e603a996d8c4bf2415326aa7 (patch) | |
tree | 79c524d49f164c8c970b119279be072aaaaee91d /chrome/browser/gtk/extension_view_gtk.cc | |
parent | 2dee6d5003f0d5a9fffd55856b9f54b404988cab (diff) | |
download | chromium_src-736d1898191dc530e603a996d8c4bf2415326aa7.zip chromium_src-736d1898191dc530e603a996d8c4bf2415326aa7.tar.gz chromium_src-736d1898191dc530e603a996d8c4bf2415326aa7.tar.bz2 |
Move chrome/browser/gtk/ to chrome/browser/ui/gtk/
(moved *.cc using 'svn mv' to preserve history)
(copied *.h using 'svn cp' to preserve history and stub out originals)
Stubbed out original headers in chrome/browser/gtk/
Update header guards & copyright dates in chrome/browser/ui/gtk/
Update .gypi files
Remove chrome/chrome_browser.gypi:4228 reference to nonexistant:
['include', '^browser/gtk/pk11_password_dialog.h'],
Remove stray header guard in:
chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.cc
Add #pragma once to the following files:
chrome/browser/ui/gtk/instant_confirm_dialog_gtk.h
chrome/browser/ui/gtk/infobar_arrow_model.h
Ran the following to appease presubmit: 'svn pset svn:eol-style LF \
chrome/browser/ui/gtk/info_bubble_accelerators_gtk.cc \
chrome/browser/ui/gtk/gtk_custom_menu.cc \
chrome/browser/ui/gtk/info_bubble_accelerators_gtk.h \
chrome/browser/ui/gtk/gtk_custom_menu.h \
chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.h \
chrome/browser/ui/gtk/chrome_gtk_frame.h \
chrome/browser/ui/gtk/chrome_gtk_frame.cc \
chrome/browser/ui/gtk/gtk_custom_menu_item.h \
chrome/browser/gtk/info_bubble_accelerators_gtk.h \
chrome/browser/gtk/gtk_custom_menu.h \
chrome/browser/gtk/options/managed_prefs_banner_gtk.h \
chrome/browser/gtk/chrome_gtk_frame.h \
chrome/browser/gtk/gtk_custom_menu_item.h'
BUG=69289
TEST=Compile&Trybots
Review URL: http://codereview.chromium.org/6251001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/extension_view_gtk.cc')
-rw-r--r-- | chrome/browser/gtk/extension_view_gtk.cc | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/chrome/browser/gtk/extension_view_gtk.cc b/chrome/browser/gtk/extension_view_gtk.cc deleted file mode 100644 index f2e49c3..0000000 --- a/chrome/browser/gtk/extension_view_gtk.cc +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/gtk/extension_view_gtk.h" - -#include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/gtk/extension_popup_gtk.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" - -ExtensionViewGtk::ExtensionViewGtk(ExtensionHost* extension_host, - Browser* browser) - : browser_(browser), - extension_host_(extension_host), - render_widget_host_view_(NULL), - container_(NULL) { -} - -void ExtensionViewGtk::Init() { - CreateWidgetHostView(); -} - -gfx::NativeView ExtensionViewGtk::native_view() { - return render_widget_host_view_->native_view(); -} - -RenderViewHost* ExtensionViewGtk::render_view_host() const { - return extension_host_->render_view_host(); -} - -void ExtensionViewGtk::SetBackground(const SkBitmap& background) { - if (render_view_host()->IsRenderViewLive()) { - render_widget_host_view_->SetBackground(background); - } else { - pending_background_ = background; - } -} - -void ExtensionViewGtk::UpdatePreferredSize(const gfx::Size& new_size) { - if (container_) - container_->OnExtensionPreferredSizeChanged(this, new_size); -} - -void ExtensionViewGtk::CreateWidgetHostView() { - DCHECK(!render_widget_host_view_); - render_widget_host_view_ = new RenderWidgetHostViewGtk(render_view_host()); - render_widget_host_view_->InitAsChild(); - - extension_host_->CreateRenderViewSoon(render_widget_host_view_); -} - -void ExtensionViewGtk::RenderViewCreated() { - if (!pending_background_.empty() && render_view_host()->view()) { - render_widget_host_view_->SetBackground(pending_background_); - pending_background_.reset(); - } - - // Tell the renderer not to draw scrollbars in popups unless the - // popups are at the maximum allowed size. - gfx::Size largest_popup_size(ExtensionPopupGtk::kMaxWidth, - ExtensionPopupGtk::kMaxHeight); - extension_host_->DisableScrollbarsForSmallWindows(largest_popup_size); -} |