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

Side by Side Diff: chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.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_win .h" 5 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_win .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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 // Reset the parent to NULL to ensure hidden tabs don't receive messages. 56 // Reset the parent to NULL to ensure hidden tabs don't receive messages.
57 static_cast<TabContentsViewViews*>(contents->view())->Unparent(); 57 static_cast<TabContentsViewViews*>(contents->view())->Unparent();
58 } 58 }
59 } 59 }
60 60
61 void NativeTabContentsContainerWin::SetFastResize(bool fast_resize) { 61 void NativeTabContentsContainerWin::SetFastResize(bool fast_resize) {
62 set_fast_resize(fast_resize); 62 set_fast_resize(fast_resize);
63 } 63 }
64 64
65 bool NativeTabContentsContainerWin::GetFastResize() const {
66 return fast_resize();
67 }
68
69 bool NativeTabContentsContainerWin::FastResizeAtLastLayout() const {
70 return fast_resize_at_last_layout();
71 }
72
65 void NativeTabContentsContainerWin::RenderViewHostChanged( 73 void NativeTabContentsContainerWin::RenderViewHostChanged(
66 RenderViewHost* old_host, 74 RenderViewHost* old_host,
67 RenderViewHost* new_host) { 75 RenderViewHost* new_host) {
68 // If we are focused, we need to pass the focus to the new RenderViewHost. 76 // If we are focused, we need to pass the focus to the new RenderViewHost.
69 if (GetFocusManager()->GetFocusedView() == this) 77 if (GetFocusManager()->GetFocusedView() == this)
70 OnFocus(); 78 OnFocus();
71 } 79 }
72 80
73 views::View* NativeTabContentsContainerWin::GetView() { 81 views::View* NativeTabContentsContainerWin::GetView() {
74 return this; 82 return this;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 //////////////////////////////////////////////////////////////////////////////// 162 ////////////////////////////////////////////////////////////////////////////////
155 // NativeTabContentsContainer, public: 163 // NativeTabContentsContainer, public:
156 164
157 // static 165 // static
158 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer( 166 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer(
159 TabContentsContainer* container) { 167 TabContentsContainer* container) {
160 if (views::Widget::IsPureViews()) 168 if (views::Widget::IsPureViews())
161 return new NativeTabContentsContainerViews(container); 169 return new NativeTabContentsContainerViews(container);
162 return new NativeTabContentsContainerWin(container); 170 return new NativeTabContentsContainerWin(container);
163 } 171 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698