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

Unified Diff: chrome/browser/browser.h

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 | « no previous file | chrome/browser/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser.h
===================================================================
--- chrome/browser/browser.h (revision 5533)
+++ chrome/browser/browser.h (working copy)
@@ -54,6 +54,9 @@
// the specified app.
static Browser* CreateForApp(const std::wstring& app_name, Profile* profile);
+ // Like Create, but creates a window parented to another window.
+ static Browser* CreateForEmbedded(HWND parent_hwnd, gfx::Rect& rect, Profile* profile);
+
// Set overrides for the initial window bounds and maximized state.
void set_override_bounds(const gfx::Rect& bounds) {
override_bounds_ = bounds;
@@ -61,6 +64,15 @@
void set_override_maximized(bool maximized) {
override_maximized_ = maximized;
}
+ gfx::Rect override_bounds() const {
+ return override_bounds_;
+ }
+ void set_parent_hwnd(HWND hwnd) {
+ parent_hwnd_ = hwnd;
+ }
+ HWND parent_hwnd() const {
+ return parent_hwnd_;
+ }
// Creates the Browser Window. Prefer to use the static helpers above where
// possible. This does not show the window. You need to call window()->Show()
@@ -344,6 +356,7 @@
virtual void CloseContents(TabContents* source);
virtual void MoveContents(TabContents* source, const gfx::Rect& pos);
virtual bool IsPopup(TabContents* source);
+ virtual bool IsEmbedded(TabContents* source);
virtual void ToolbarSizeChanged(TabContents* source, bool is_animating);
virtual void URLStarredChanged(TabContents* source, bool starred);
@@ -595,6 +608,10 @@
// Keep track of the encoding auto detect pref.
BooleanPrefMember encoding_auto_detect_;
+ // Add a member used to store the parent window handle when running as an
+ // embedded client.
+ HWND parent_hwnd_;
+
DISALLOW_COPY_AND_ASSIGN(Browser);
};
« no previous file with comments | « no previous file | chrome/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698