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

Unified Diff: views/window/window.h

Issue 7129022: Move last of event handlers down to NativeWidgetWin/Gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 months 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 | « views/window/native_window_win.cc ('k') | views/window/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/window/window.h
===================================================================
--- views/window/window.h (revision 88529)
+++ views/window/window.h (working copy)
@@ -11,7 +11,6 @@
#include "views/window/native_window_delegate.h"
namespace gfx {
-class Font;
class Rect;
class Size;
} // namespace gfx
@@ -50,22 +49,11 @@
const gfx::Rect& bounds,
WindowDelegate* window_delegate);
- // Returns the preferred size of the contents view of this window based on
- // its localized size data. The width in cols is held in a localized string
- // resource identified by |col_resource_id|, the height in the same fashion.
- // TODO(beng): This should eventually live somewhere else, probably closer to
- // ClientView.
- static int GetLocalizedContentsWidth(int col_resource_id);
- static int GetLocalizedContentsHeight(int row_resource_id);
- static gfx::Size GetLocalizedContentsSize(int col_resource_id,
- int row_resource_id);
-
// Initializes the window. Must be called before any post-configuration
// operations are performed.
void InitWindow(const InitParams& params);
// Overridden from Widget:
- virtual void Show() OVERRIDE;
virtual Window* AsWindow() OVERRIDE;
virtual const Window* AsWindow() const OVERRIDE;
@@ -81,24 +69,11 @@
protected:
// Overridden from NativeWindowDelegate:
- virtual bool IsModal() const OVERRIDE;
- virtual bool IsDialogBox() const OVERRIDE;
- virtual void OnNativeWindowCreated(const gfx::Rect& bounds) OVERRIDE;
virtual internal::NativeWidgetDelegate* AsNativeWidgetDelegate() OVERRIDE;
private:
- // Sizes and positions the window just after it is created.
- void SetInitialBounds(const gfx::Rect& bounds);
-
NativeWindow* native_window_;
- // The saved maximized state for this window. See note in SetInitialBounds
- // that explains why we save this.
- bool saved_maximized_state_;
-
- // The smallest size the window can be.
- gfx::Size minimum_size_;
-
DISALLOW_COPY_AND_ASSIGN(Window);
};
« no previous file with comments | « views/window/native_window_win.cc ('k') | views/window/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698