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

Side by Side Diff: chrome/browser/ui/views/tab_contents/native_tab_contents_container_views.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_vie ws.h" 5 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_vie ws.h"
6 6
7 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" 7 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
8 #include "chrome/browser/ui/view_ids.h" 8 #include "chrome/browser/ui/view_ids.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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 TabContentsViewViews* widget = 46 TabContentsViewViews* widget =
47 static_cast<TabContentsViewViews*>(contents->view()); 47 static_cast<TabContentsViewViews*>(contents->view());
48 views::NativeWidgetViews* nwv = 48 views::NativeWidgetViews* nwv =
49 static_cast<views::NativeWidgetViews*>(widget->native_widget()); 49 static_cast<views::NativeWidgetViews*>(widget->native_widget());
50 RemoveChildView(nwv->GetView()); 50 RemoveChildView(nwv->GetView());
51 } 51 }
52 52
53 void NativeTabContentsContainerViews::SetFastResize(bool fast_resize) { 53 void NativeTabContentsContainerViews::SetFastResize(bool fast_resize) {
54 } 54 }
55 55
56 bool NativeTabContentsContainerViews::GetFastResize() const {
57 return false;
58 }
59
60 bool NativeTabContentsContainerViews::FastResizeAtLastLayout() const {
61 return false;
62 }
63
56 void NativeTabContentsContainerViews::RenderViewHostChanged( 64 void NativeTabContentsContainerViews::RenderViewHostChanged(
57 RenderViewHost* old_host, 65 RenderViewHost* old_host,
58 RenderViewHost* new_host) { 66 RenderViewHost* new_host) {
59 // If we are focused, we need to pass the focus to the new RenderViewHost. 67 // If we are focused, we need to pass the focus to the new RenderViewHost.
60 if (GetFocusManager()->GetFocusedView() == this) 68 if (GetFocusManager()->GetFocusedView() == this)
61 OnFocus(); 69 OnFocus();
62 } 70 }
63 71
64 views::View* NativeTabContentsContainerViews::GetView() { 72 views::View* NativeTabContentsContainerViews::GetView() {
65 return this; 73 return this;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 void NativeTabContentsContainerViews::GetAccessibleState( 131 void NativeTabContentsContainerViews::GetAccessibleState(
124 ui::AccessibleViewState* state) { 132 ui::AccessibleViewState* state) {
125 state->role = ui::AccessibilityTypes::ROLE_GROUPING; 133 state->role = ui::AccessibilityTypes::ROLE_GROUPING;
126 } 134 }
127 135
128 gfx::NativeViewAccessible 136 gfx::NativeViewAccessible
129 NativeTabContentsContainerViews::GetNativeViewAccessible() { 137 NativeTabContentsContainerViews::GetNativeViewAccessible() {
130 return View::GetNativeViewAccessible(); 138 return View::GetNativeViewAccessible();
131 } 139 }
132 140
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698