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

Side by Side Diff: views/controls/tabbed_pane/tabbed_pane.cc

Issue 3044022: Fix code path in TabbedPane::RemoveTabAtIndex() (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "views/controls/tabbed_pane/tabbed_pane.h" 5 #include "views/controls/tabbed_pane/tabbed_pane.h"
6 6
7 #include "base/keyboard_codes.h" 7 #include "base/keyboard_codes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "views/controls/native/native_view_host.h" 9 #include "views/controls/native/native_view_host.h"
10 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h" 10 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 int TabbedPane::GetSelectedTabIndex() { 43 int TabbedPane::GetSelectedTabIndex() {
44 return native_tabbed_pane_->GetSelectedTabIndex(); 44 return native_tabbed_pane_->GetSelectedTabIndex();
45 } 45 }
46 46
47 View* TabbedPane::GetSelectedTab() { 47 View* TabbedPane::GetSelectedTab() {
48 return native_tabbed_pane_->GetSelectedTab(); 48 return native_tabbed_pane_->GetSelectedTab();
49 } 49 }
50 50
51 View* TabbedPane::RemoveTabAtIndex(int index) { 51 View* TabbedPane::RemoveTabAtIndex(int index) {
52 return native_tabbed_pane_->RemoveTabAtIndex(index); 52 View* tab = native_tabbed_pane_->RemoveTabAtIndex(index);
53 PreferredSizeChanged(); 53 PreferredSizeChanged();
54 return tab;
54 } 55 }
55 56
56 void TabbedPane::SelectTabAt(int index) { 57 void TabbedPane::SelectTabAt(int index) {
57 native_tabbed_pane_->SelectTabAt(index); 58 native_tabbed_pane_->SelectTabAt(index);
58 } 59 }
59 60
60 int TabbedPane::GetTabCount() { 61 int TabbedPane::GetTabCount() {
61 return native_tabbed_pane_->GetTabCount(); 62 return native_tabbed_pane_->GetTabCount();
62 } 63 }
63 64
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 *role = AccessibilityTypes::ROLE_PAGETABLIST; 135 *role = AccessibilityTypes::ROLE_PAGETABLIST;
135 return true; 136 return true;
136 } 137 }
137 138
138 gfx::Size TabbedPane::GetPreferredSize() { 139 gfx::Size TabbedPane::GetPreferredSize() {
139 return native_tabbed_pane_ ? 140 return native_tabbed_pane_ ?
140 native_tabbed_pane_->GetPreferredSize() : gfx::Size(); 141 native_tabbed_pane_->GetPreferredSize() : gfx::Size();
141 } 142 }
142 143
143 } // namespace views 144 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698