chrome/browser/ui/views/tab_contents/native_tab_contents_container_views.h - Issue 8573029: Fixes regression where showing bookmark bar (or download shelf)

Side by Side Diff: chrome/browser/ui/views/tab_contents/native_tab_contents_container_views.h

Issue 8573029: Fixes regression where showing bookmark bar (or download shelf) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Tweaks Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc ('k') | chrome/browser/ui/views/tab_contents/native_tab_contents_container_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_VIEWS _H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_VIEWS _H_

6 #define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_VIEWS _H_	6 #define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_VIEWS _H_

7 #pragma once	7 #pragma once

8	8

9 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h"	9 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h"

10 #include "views/view.h"	10 #include "views/view.h"

11	11

12 class NativeTabContentsContainerViews : public NativeTabContentsContainer,	12 class NativeTabContentsContainerViews : public NativeTabContentsContainer,

13 public views::View {	13 public views::View {

14 public:	14 public:

15 explicit NativeTabContentsContainerViews(TabContentsContainer* container);	15 explicit NativeTabContentsContainerViews(TabContentsContainer* container);

16 virtual ~NativeTabContentsContainerViews();	16 virtual ~NativeTabContentsContainerViews();

17	17

18 // Overridden from NativeTabContentsContainer:	18 // Overridden from NativeTabContentsContainer:

19 virtual void AttachContents(TabContents* contents) OVERRIDE;	19 virtual void AttachContents(TabContents* contents) OVERRIDE;

20 virtual void DetachContents(TabContents* contents) OVERRIDE;	20 virtual void DetachContents(TabContents* contents) OVERRIDE;

21 virtual void SetFastResize(bool fast_resize) OVERRIDE;	21 virtual void SetFastResize(bool fast_resize) OVERRIDE;

	22 virtual bool GetFastResize() const OVERRIDE;

	23 virtual bool FastResizeAtLastLayout() const OVERRIDE;

22 virtual void RenderViewHostChanged(RenderViewHost* old_host,	24 virtual void RenderViewHostChanged(RenderViewHost* old_host,

23 RenderViewHost* new_host) OVERRIDE;	25 RenderViewHost* new_host) OVERRIDE;

24 virtual void TabContentsFocused(TabContents* tab_contents) OVERRIDE;	26 virtual void TabContentsFocused(TabContents* tab_contents) OVERRIDE;

25 virtual views::View* GetView() OVERRIDE;	27 virtual views::View* GetView() OVERRIDE;

26	28

27 // Overridden from views::View:	29 // Overridden from views::View:

28 virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) OVERRIDE;	30 virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) OVERRIDE;

29 virtual bool IsFocusable() const OVERRIDE;	31 virtual bool IsFocusable() const OVERRIDE;

30 virtual void OnFocus() OVERRIDE;	32 virtual void OnFocus() OVERRIDE;

31 virtual void RequestFocus() OVERRIDE;	33 virtual void RequestFocus() OVERRIDE;

32 virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;	34 virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;

33 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;	35 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;

34 virtual gfx::NativeViewAccessible GetNativeViewAccessible();	36 virtual gfx::NativeViewAccessible GetNativeViewAccessible();

35	37

36 private:	38 private:

37 TabContentsContainer* container_;	39 TabContentsContainer* container_;

38	40

39 DISALLOW_COPY_AND_ASSIGN(NativeTabContentsContainerViews);	41 DISALLOW_COPY_AND_ASSIGN(NativeTabContentsContainerViews);

40 };	42 };

41	43

42 #endif // CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_VI EWS_H_	44 #endif // CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_VI EWS_H_

OLD	NEW