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

Side by Side Diff: chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.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_aur a.h" 5 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_aur a.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 30 matching lines...) Expand all
41 } 41 }
42 42
43 void NativeTabContentsContainerAura::DetachContents(TabContents* contents) { 43 void NativeTabContentsContainerAura::DetachContents(TabContents* contents) {
44 // Detach the TabContents. Do this before we unparent the 44 // Detach the TabContents. Do this before we unparent the
45 // TabContentsViewViews so that the window hierarchy is intact for any 45 // TabContentsViewViews so that the window hierarchy is intact for any
46 // cleanup during Detach(). 46 // cleanup during Detach().
47 Detach(); 47 Detach();
48 } 48 }
49 49
50 void NativeTabContentsContainerAura::SetFastResize(bool fast_resize) { 50 void NativeTabContentsContainerAura::SetFastResize(bool fast_resize) {
51 NOTIMPLEMENTED(); 51 set_fast_resize(fast_resize);
52 }
53
54 bool NativeTabContentsContainerAura::GetFastResize() const {
55 return fast_resize();
56 }
57
58 bool NativeTabContentsContainerAura::FastResizeAtLastLayout() const {
59 return fast_resize_at_last_layout();
52 } 60 }
53 61
54 void NativeTabContentsContainerAura::RenderViewHostChanged( 62 void NativeTabContentsContainerAura::RenderViewHostChanged(
55 RenderViewHost* old_host, 63 RenderViewHost* old_host,
56 RenderViewHost* new_host) { 64 RenderViewHost* new_host) {
57 // If we are focused, we need to pass the focus to the new RenderViewHost. 65 // If we are focused, we need to pass the focus to the new RenderViewHost.
58 if (GetFocusManager()->GetFocusedView() == this) 66 if (GetFocusManager()->GetFocusedView() == this)
59 OnFocus(); 67 OnFocus();
60 } 68 }
61 69
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 } 142 }
135 143
136 //////////////////////////////////////////////////////////////////////////////// 144 ////////////////////////////////////////////////////////////////////////////////
137 // NativeTabContentsContainer, public: 145 // NativeTabContentsContainer, public:
138 146
139 // static 147 // static
140 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer( 148 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer(
141 TabContentsContainer* container) { 149 TabContentsContainer* container) {
142 return new NativeTabContentsContainerAura(container); 150 return new NativeTabContentsContainerAura(container);
143 } 151 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698