summaryrefslogtreecommitdiffstats
path: root/content/shell/shell_win.cc
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-14 02:40:35 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-14 02:40:35 +0000
commit5cba3bf230f84b111530d0478c95dda25e677e58 (patch)
tree03969d9108908393f3e364b9e8de89026d29c27c /content/shell/shell_win.cc
parent1558fff3237b89156cb0c91a693122131533c286 (diff)
downloadchromium_src-5cba3bf230f84b111530d0478c95dda25e677e58.zip
chromium_src-5cba3bf230f84b111530d0478c95dda25e677e58.tar.gz
chromium_src-5cba3bf230f84b111530d0478c95dda25e677e58.tar.bz2
Content: First draft at a content_shell on GTK.
THIS IS NOT READY FOR DAILY USE. The shell, in its current state, can bring up the default google.com homepage. And that's about it. There are problems with the url bar, scrolling (weird crashes complaining about not having a ResourceBundle), it breaks badly on popups, et cetera. BUG=90445 TEST=none; this is a testing tool. Review URL: http://codereview.chromium.org/9213012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_win.cc')
-rw-r--r--content/shell/shell_win.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/content/shell/shell_win.cc b/content/shell/shell_win.cc
index 70adb9d..e274b66 100644
--- a/content/shell/shell_win.cc
+++ b/content/shell/shell_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -12,6 +12,7 @@
#include "base/utf_string_conversions.h"
#include "base/win/resource_util.h"
#include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/tab_contents/tab_contents_view_win.h"
#include "content/shell/resource.h"
#include "googleurl/src/gurl.h"
#include "grit/webkit_resources.h"
@@ -143,6 +144,12 @@ void Shell::PlatformCreateWindow(int width, int height) {
PlatformSizeTo(width, height);
}
+void Shell::PlatformSetContents() {
+ TabContentsViewWin* view =
+ static_cast<TabContentsViewWin*>(tab_contents_->GetView());
+ view->SetParent(window_);
+}
+
void Shell::PlatformSizeTo(int width, int height) {
RECT rc, rw;
GetClientRect(window_, &rc);