diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-17 22:25:33 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-17 22:25:33 +0000 |
commit | 6f3bb6ca5a2e423fc9dda71c164c7e8ae2a8eae7 (patch) | |
tree | 4ce1316dbfd179681bdff905a7d71f1b4cbb902c /chrome/browser/views/hwnd_html_view.cc | |
parent | 4c45708be10906e3cdbe9d40d206cfd3fcbaf1c2 (diff) | |
download | chromium_src-6f3bb6ca5a2e423fc9dda71c164c7e8ae2a8eae7.zip chromium_src-6f3bb6ca5a2e423fc9dda71c164c7e8ae2a8eae7.tar.gz chromium_src-6f3bb6ca5a2e423fc9dda71c164c7e8ae2a8eae7.tar.bz2 |
Rename legacy methods that were in CamelCase to unix_hacker.
Required going through and modifying some of the code to
solve name clashes.
Review URL: http://codereview.chromium.org/2945
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/hwnd_html_view.cc')
-rw-r--r-- | chrome/browser/views/hwnd_html_view.cc | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/chrome/browser/views/hwnd_html_view.cc b/chrome/browser/views/hwnd_html_view.cc index d1c543a..ebb610b 100644 --- a/chrome/browser/views/hwnd_html_view.cc +++ b/chrome/browser/views/hwnd_html_view.cc @@ -1,52 +1,52 @@ -// Copyright (c) 2006-2008 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/views/hwnd_html_view.h"
-
-#include "chrome/browser/render_view_host.h"
-#include "chrome/browser/render_widget_host_hwnd.h"
-#include "chrome/browser/render_view_host_delegate.h"
-#include "chrome/browser/site_instance.h"
-#include "chrome/views/view_container.h"
-
-HWNDHtmlView::~HWNDHtmlView() {
- if (render_view_host_) {
- Detach();
- render_view_host_->Shutdown();
- render_view_host_ = NULL;
- }
-}
-
-void HWNDHtmlView::Init(HWND parent_hwnd) {
- DCHECK(!render_view_host_) << "Already initialized.";
- RenderViewHost* rvh = new RenderViewHost(
- SiteInstance::CreateSiteInstance(delegate_->GetProfile()),
- delegate_, MSG_ROUTING_NONE, NULL);
- render_view_host_ = rvh;
-
- RenderWidgetHostHWND* view = new RenderWidgetHostHWND(rvh);
- rvh->set_view(view);
-
- // Create the HWND. Note:
- // RenderWidgetHostHWND supports windowed plugins, but if we ever also wanted
- // to support constrained windows with this, we would need an additional
- // HWND to parent off of because windowed plugin HWNDs cannot exist in the
- // same z-order as constrained windows.
- HWND hwnd = view->Create(parent_hwnd);
- view->ShowWindow(SW_SHOW);
- ChromeViews::HWNDView::Attach(hwnd);
-
- // Start up the renderer.
- if (allow_dom_ui_bindings_)
- rvh->AllowDOMUIBindings();
- rvh->CreateRenderView();
- rvh->NavigateToURL(content_url_);
- initialized_ = true;
-}
-
-void HWNDHtmlView::ViewHierarchyChanged(bool is_add, View* parent,
- View* child) {
- if (is_add && GetViewContainer() && !initialized_)
- Init(GetViewContainer()->GetHWND());
-}
+// Copyright (c) 2006-2008 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/views/hwnd_html_view.h" + +#include "chrome/browser/render_view_host.h" +#include "chrome/browser/render_widget_host_hwnd.h" +#include "chrome/browser/render_view_host_delegate.h" +#include "chrome/browser/site_instance.h" +#include "chrome/views/view_container.h" + +HWNDHtmlView::~HWNDHtmlView() { + if (render_view_host_) { + Detach(); + render_view_host_->Shutdown(); + render_view_host_ = NULL; + } +} + +void HWNDHtmlView::Init(HWND parent_hwnd) { + DCHECK(!render_view_host_) << "Already initialized."; + RenderViewHost* rvh = new RenderViewHost( + SiteInstance::CreateSiteInstance(delegate_->GetProfile()), + delegate_, MSG_ROUTING_NONE, NULL); + render_view_host_ = rvh; + + RenderWidgetHostHWND* view = new RenderWidgetHostHWND(rvh); + rvh->set_view(view); + + // Create the HWND. Note: + // RenderWidgetHostHWND supports windowed plugins, but if we ever also wanted + // to support constrained windows with this, we would need an additional + // HWND to parent off of because windowed plugin HWNDs cannot exist in the + // same z-order as constrained windows. + HWND hwnd = view->Create(parent_hwnd); + view->ShowWindow(SW_SHOW); + ChromeViews::HWNDView::Attach(hwnd); + + // Start up the renderer. + if (allow_dom_ui_bindings_) + rvh->AllowDOMUIBindings(); + rvh->CreateRenderView(); + rvh->NavigateToURL(content_url_); + initialized_ = true; +} + +void HWNDHtmlView::ViewHierarchyChanged(bool is_add, View* parent, + View* child) { + if (is_add && GetViewContainer() && !initialized_) + Init(GetViewContainer()->GetHWND()); +} |