From 1920e823284826c00ba11adb1ff3ccb7fba2f0f5 Mon Sep 17 00:00:00 2001
From: "beng@google.com" <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 31 Jul 2008 05:34:22 +0000
Subject: rollback these changes
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/views/custom_frame_window.cc | 19 ++++++++-----------
chrome/views/custom_frame_window.h | 9 +++------
chrome/views/window.h | 3 ---
3 files changed, 11 insertions(+), 20 deletions(-)
(limited to 'chrome/views')
diff --git a/chrome/views/custom_frame_window.cc b/chrome/views/custom_frame_window.cc
index 97c1c89..928947e 100644
--- a/chrome/views/custom_frame_window.cc
+++ b/chrome/views/custom_frame_window.cc
@@ -831,17 +831,6 @@ void DefaultNonClientView::InitClass() {
///////////////////////////////////////////////////////////////////////////////
// CustomFrameWindow, public:
-CustomFrameWindow::~CustomFrameWindow() {
-}
-
-void CustomFrameWindow::ExecuteSystemMenuCommand(int command) {
- if (command)
- SendMessage(GetHWND(), WM_SYSCOMMAND, command, 0);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// CustomFrameWindow, protected:
-
CustomFrameWindow::CustomFrameWindow(WindowDelegate* window_delegate)
: Window(window_delegate),
non_client_view_(new DefaultNonClientView(this)),
@@ -856,6 +845,14 @@ CustomFrameWindow::CustomFrameWindow(WindowDelegate* window_delegate,
InitClass();
}
+CustomFrameWindow::~CustomFrameWindow() {
+}
+
+void CustomFrameWindow::ExecuteSystemMenuCommand(int command) {
+ if (command)
+ SendMessage(GetHWND(), WM_SYSCOMMAND, command, 0);
+}
+
///////////////////////////////////////////////////////////////////////////////
// CustomFrameWindow, Window overrides:
diff --git a/chrome/views/custom_frame_window.h b/chrome/views/custom_frame_window.h
index 2fad406..d61b6b8 100644
--- a/chrome/views/custom_frame_window.h
+++ b/chrome/views/custom_frame_window.h
@@ -50,6 +50,9 @@ class NonClientView;
////////////////////////////////////////////////////////////////////////////////
class CustomFrameWindow : public Window {
public:
+ explicit CustomFrameWindow(WindowDelegate* window_delegate);
+ CustomFrameWindow(WindowDelegate* window_delegate,
+ NonClientView* non_client_view);
virtual ~CustomFrameWindow();
// Executes the specified SC_command.
@@ -66,12 +69,6 @@ class CustomFrameWindow : public Window {
virtual void UpdateWindowTitle();
protected:
- // Cannot construct one of these directly - use Window::CreateChromeWindow.
- // Subclasses _must_ call one of these constructors.
- explicit CustomFrameWindow(WindowDelegate* window_delegate);
- CustomFrameWindow(WindowDelegate* window_delegate,
- NonClientView* non_client_view);
-
// Overridden from Window:
virtual void SizeWindowToDefault();
virtual void EnableClose(bool enable);
diff --git a/chrome/views/window.h b/chrome/views/window.h
index 4173a27..a941cb2 100644
--- a/chrome/views/window.h
+++ b/chrome/views/window.h
@@ -244,9 +244,6 @@ class Window : public HWNDViewContainer {
// Set to true if the window is in the process of closing .
bool window_closed_;
- // Allows CreateChromeWindow to access CustomFrameWindow's ctor.
- friend class CustomFrameWindow;
-
DISALLOW_EVIL_CONSTRUCTORS(Window);
};
--
cgit v1.1