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

Side by Side Diff: chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.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
OLDNEW
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_GTK_H _ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_GTK_H _
6 #define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_GTK_H _ 6 #define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_GTK_H _
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
11 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h" 11 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h"
12 #include "views/controls/native/native_view_host.h" 12 #include "views/controls/native/native_view_host.h"
13 13
14 class NativeTabContentsContainerGtk : public NativeTabContentsContainer, 14 class NativeTabContentsContainerGtk : public NativeTabContentsContainer,
15 public views::NativeViewHost { 15 public views::NativeViewHost {
16 public: 16 public:
17 explicit NativeTabContentsContainerGtk(TabContentsContainer* container); 17 explicit NativeTabContentsContainerGtk(TabContentsContainer* container);
18 virtual ~NativeTabContentsContainerGtk(); 18 virtual ~NativeTabContentsContainerGtk();
19 19
20 // Overridden from NativeTabContentsContainer: 20 // Overridden from NativeTabContentsContainer:
21 virtual void AttachContents(TabContents* contents) OVERRIDE; 21 virtual void AttachContents(TabContents* contents) OVERRIDE;
22 virtual void DetachContents(TabContents* contents) OVERRIDE; 22 virtual void DetachContents(TabContents* contents) OVERRIDE;
23 virtual void SetFastResize(bool fast_resize) OVERRIDE; 23 virtual void SetFastResize(bool fast_resize) OVERRIDE;
24 virtual bool GetFastResize() const OVERRIDE;
25 virtual bool FastResizeAtLastLayout() const OVERRIDE;
24 virtual void RenderViewHostChanged(RenderViewHost* old_host, 26 virtual void RenderViewHostChanged(RenderViewHost* old_host,
25 RenderViewHost* new_host) OVERRIDE; 27 RenderViewHost* new_host) OVERRIDE;
26 virtual void TabContentsFocused(TabContents* tab_contents) OVERRIDE; 28 virtual void TabContentsFocused(TabContents* tab_contents) OVERRIDE;
27 virtual views::View* GetView() OVERRIDE; 29 virtual views::View* GetView() OVERRIDE;
28 30
29 // Overridden from views::View: 31 // Overridden from views::View:
30 virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) OVERRIDE; 32 virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) OVERRIDE;
31 virtual views::FocusTraversable* GetFocusTraversable() OVERRIDE; 33 virtual views::FocusTraversable* GetFocusTraversable() OVERRIDE;
32 virtual bool IsFocusable() const OVERRIDE; 34 virtual bool IsFocusable() const OVERRIDE;
33 virtual void OnFocus() OVERRIDE; 35 virtual void OnFocus() OVERRIDE;
34 virtual void RequestFocus() OVERRIDE; 36 virtual void RequestFocus() OVERRIDE;
35 virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE; 37 virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
36 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 38 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
37 39
38 private: 40 private:
39 TabContentsContainer* container_; 41 TabContentsContainer* container_;
40 42
41 gulong focus_callback_id_; 43 gulong focus_callback_id_;
42 44
43 DISALLOW_COPY_AND_ASSIGN(NativeTabContentsContainerGtk); 45 DISALLOW_COPY_AND_ASSIGN(NativeTabContentsContainerGtk);
44 }; 46 };
45 47
46 #endif // CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_GT K_H_ 48 #endif // CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_GT K_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698