Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3268)

Unified Diff: chrome/browser/views/frame/browser_window_factory.cc

Issue 10973: Test the feasibility of turning Chrome into a multi-process ActiveX control Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/views/frame/browser_view.cc ('k') | chrome/browser/views/frame/embedded_frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/frame/browser_window_factory.cc
===================================================================
--- chrome/browser/views/frame/browser_window_factory.cc (revision 5533)
+++ chrome/browser/views/frame/browser_window_factory.cc (working copy)
@@ -10,6 +10,7 @@
#include "chrome/browser/views/frame/aero_glass_frame.h"
#include "chrome/browser/views/frame/browser_frame.h"
#include "chrome/browser/views/frame/browser_view.h"
+#include "chrome/browser/views/frame/embedded_frame.h"
#include "chrome/browser/views/frame/opaque_frame.h"
#include "chrome/common/win_util.h"
@@ -36,6 +37,14 @@
// static
BrowserFrame* BrowserFrame::CreateForBrowserView(BrowserFrame::FrameType type,
BrowserView* browser_view) {
+ // Embedded windows will have a parent window handle
+ Browser* browser = browser_view->browser();
+ if(browser->parent_hwnd()) {
+ EmbeddedFrame* frame = new EmbeddedFrame(browser_view);
+ frame->Init(browser->parent_hwnd(), browser->override_bounds());
+ return frame;
+ }
+
if (type == FRAMETYPE_OPAQUE) {
OpaqueFrame* frame = new OpaqueFrame(browser_view);
frame->Init();
« no previous file with comments | « chrome/browser/views/frame/browser_view.cc ('k') | chrome/browser/views/frame/embedded_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698