diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 00:15:06 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 00:15:06 +0000 |
| commit | 96d2a75e2afc65b2bed77c6808200ef89d103c52 (patch) | |
| tree | 8ce04aa79e7d954fb8499a8829c9251828e652f7 /views/window/native_window_views.h | |
| parent | 03c52686ea954648d3e9091ca78ceb9fcc8b6dad (diff) | |
| download | chromium_src-96d2a75e2afc65b2bed77c6808200ef89d103c52.zip chromium_src-96d2a75e2afc65b2bed77c6808200ef89d103c52.tar.gz chromium_src-96d2a75e2afc65b2bed77c6808200ef89d103c52.tar.bz2 | |
Revert 86914 - Move a bunch of functions from Window onto Widget.
Many tests in browser_tests crashed with a LOG(DFATAL) message on Chrome OS:
[28862:28862:0526/153905:3290241082989:FATAL:browser_main.cc(955)] GLib-GObject: invalid (NULL) pointer instance
Backtrace:
base::debug::StackTrace::StackTrace() [0x33308d6]
logging::LogMessage::~LogMessage() [0x334df2e]
(anonymous namespace)::GLibLogHandler() [0x7c7d45]
0x2ab2a37a7fb9
0x2ab2a37a83d3
0x2ab2a313302a
0x2ab2a31315c5
views::NativeWidgetGtk::InitNativeWidget() [0x1a30dcf]
views::Widget::Init() [0x1a37fa7]
NativeTabContentsViewGtk::InitNativeTabContentsView() [0x10c6b83]
TabContentsViewViews::CreateView() [0x397ac46]
TabContents::TabContents() [0x1501e09]
Browser::TabContentsFactory() [0xc84725]
browser::Navigate() [0xc954c7]
Browser::AddSelectedTabWithURL() [0xc76d9e]
(anonymous namespace)::InitializeBrowser() [0x70be3d]
InProcessBrowserTest::CreateBrowser() [0x70d178]
InProcessBrowserTest::RunTestOnMainThreadLoop() [0x70d34a]
[...snipped...]
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/7075019
R=msw@chromium.org
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/6976040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window/native_window_views.h')
| -rw-r--r-- | views/window/native_window_views.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/views/window/native_window_views.h b/views/window/native_window_views.h index 83339be..65a4310 100644 --- a/views/window/native_window_views.h +++ b/views/window/native_window_views.h @@ -44,11 +44,23 @@ class NativeWindowViews : public NativeWidgetViews, virtual void SetAccessibleState(ui::AccessibilityTypes::State state) OVERRIDE; virtual void SetWindowBounds(const gfx::Rect& bounds, gfx::NativeWindow other_window) OVERRIDE; + virtual void HideWindow() OVERRIDE; + virtual void Activate() OVERRIDE; + virtual void Deactivate() OVERRIDE; + virtual void Maximize() OVERRIDE; + virtual void Minimize() OVERRIDE; + virtual void Restore() OVERRIDE; + virtual bool IsActive() const OVERRIDE; + virtual bool IsVisible() const OVERRIDE; + virtual bool IsMaximized() const OVERRIDE; + virtual bool IsMinimized() const OVERRIDE; virtual void SetFullscreen(bool fullscreen) OVERRIDE; virtual bool IsFullscreen() const OVERRIDE; + virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; virtual void SetUseDragFrame(bool use_drag_frame) OVERRIDE; virtual NonClientFrameView* CreateFrameViewForWindow() OVERRIDE; virtual void UpdateFrameAfterFrameChange() OVERRIDE; + virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; virtual bool ShouldUseNativeFrame() const OVERRIDE; virtual void FrameTypeChanged() OVERRIDE; |