diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 00:15:37 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 00:15:37 +0000 |
| commit | 41b946d3b39411c505f66a9dba6dc052d80dde88 (patch) | |
| tree | 4dcca83abfc727b02d2fc55fb97d1fc74ee9283e /chrome/browser/external_tab_container_win.h | |
| parent | 88df2dcb0c27fcc59835d72d35960d6da6649655 (diff) | |
| download | chromium_src-41b946d3b39411c505f66a9dba6dc052d80dde88.zip chromium_src-41b946d3b39411c505f66a9dba6dc052d80dde88.tar.gz chromium_src-41b946d3b39411c505f66a9dba6dc052d80dde88.tar.bz2 | |
Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.
Now there is:
... window::ShouldUseNativeFrame()
Which is basically just a pass-thru to
WindowWin::ShouldUseNativeFrame()
... which can be overridden by subclasses. Native-Frame is a windows-only concept but keeping the API on Window means I don't have to update a lot of call sites.
Window also gains a FrameType state member that toggles three states - default, force-native and force-custom.
This supercedes the "AlwaysUseNativeFrame/AlwaysUseCustomFrame" methods on NonClientView.
I have also hooked up a context menu item behind a command line flag --debug-enable-frame-toggle that allows the frame type for an individual window to be toggled, useful for debugging.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7036014
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/6975037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container_win.h')
| -rw-r--r-- | chrome/browser/external_tab_container_win.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h index 6239386..4a3ac39 100644 --- a/chrome/browser/external_tab_container_win.h +++ b/chrome/browser/external_tab_container_win.h @@ -187,8 +187,7 @@ class ExternalTabContainer : public TabContentsDelegate, static scoped_refptr<ExternalTabContainer> RemovePendingTab(uintptr_t cookie); // Overridden from views::WidgetWin: - virtual views::Window* GetContainingWindow() OVERRIDE; - virtual const views::Window* GetContainingWindow() const OVERRIDE; + virtual views::Window* GetWindow(); // Handles the specified |accelerator| being pressed. bool AcceleratorPressed(const views::Accelerator& accelerator); |