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

Side by Side Diff: chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc

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 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk .h" 5 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk .h"
6 6
7 #include "chrome/browser/ui/view_ids.h" 7 #include "chrome/browser/ui/view_ids.h"
8 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_vie ws.h" 8 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_vie ws.h"
9 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" 9 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
10 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" 10 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
(...skipping 29 matching lines...) Expand all
40 // Now detach the TabContents. 40 // Now detach the TabContents.
41 Detach(); 41 Detach();
42 42
43 static_cast<TabContentsViewViews*>(contents->view())->Unparent(); 43 static_cast<TabContentsViewViews*>(contents->view())->Unparent();
44 } 44 }
45 45
46 void NativeTabContentsContainerGtk::SetFastResize(bool fast_resize) { 46 void NativeTabContentsContainerGtk::SetFastResize(bool fast_resize) {
47 set_fast_resize(fast_resize); 47 set_fast_resize(fast_resize);
48 } 48 }
49 49
50 bool NativeTabContentsContainerGtk::GetFastResize() const {
51 return fast_resize();
52 }
53
54 bool NativeTabContentsContainerGtk::FastResizeAtLastLayout() const {
55 return fast_resize_at_last_layout();
56 }
57
50 void NativeTabContentsContainerGtk::RenderViewHostChanged( 58 void NativeTabContentsContainerGtk::RenderViewHostChanged(
51 RenderViewHost* old_host, 59 RenderViewHost* old_host,
52 RenderViewHost* new_host) { 60 RenderViewHost* new_host) {
53 // If we are focused, we need to pass the focus to the new RenderViewHost. 61 // If we are focused, we need to pass the focus to the new RenderViewHost.
54 if (GetFocusManager()->GetFocusedView() == this) 62 if (GetFocusManager()->GetFocusedView() == this)
55 OnFocus(); 63 OnFocus();
56 } 64 }
57 65
58 views::View* NativeTabContentsContainerGtk::GetView() { 66 views::View* NativeTabContentsContainerGtk::GetView() {
59 return this; 67 return this;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 //////////////////////////////////////////////////////////////////////////////// 146 ////////////////////////////////////////////////////////////////////////////////
139 // NativeTabContentsContainer, public: 147 // NativeTabContentsContainer, public:
140 148
141 // static 149 // static
142 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer( 150 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer(
143 TabContentsContainer* container) { 151 TabContentsContainer* container) {
144 if (views::Widget::IsPureViews()) 152 if (views::Widget::IsPureViews())
145 return new NativeTabContentsContainerViews(container); 153 return new NativeTabContentsContainerViews(container);
146 return new NativeTabContentsContainerGtk(container); 154 return new NativeTabContentsContainerGtk(container);
147 } 155 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698