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

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

Issue 10831009: Change the GetSelectedTab method of the NativeTabbedPaneView to return the tab contents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments (msw): Remove WidgetDelegateImpl. Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/views/controls/tabbed_pane/native_tabbed_pane_views.h" 5 #include "ui/views/controls/tabbed_pane/native_tabbed_pane_views.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 352
353 int NativeTabbedPaneViews::GetTabCount() { 353 int NativeTabbedPaneViews::GetTabCount() {
354 return tab_strip_->child_count(); 354 return tab_strip_->child_count();
355 } 355 }
356 356
357 int NativeTabbedPaneViews::GetSelectedTabIndex() { 357 int NativeTabbedPaneViews::GetSelectedTabIndex() {
358 return tab_strip_->GetSelectedIndex(); 358 return tab_strip_->GetSelectedIndex();
359 } 359 }
360 360
361 View* NativeTabbedPaneViews::GetSelectedTab() { 361 View* NativeTabbedPaneViews::GetSelectedTab() {
362 return tab_strip_->selected_tab(); 362 return content_view_->child_at(GetSelectedTabIndex());
363 } 363 }
364 364
365 View* NativeTabbedPaneViews::GetView() { 365 View* NativeTabbedPaneViews::GetView() {
366 return this; 366 return this;
367 } 367 }
368 368
369 void NativeTabbedPaneViews::SetFocus() { 369 void NativeTabbedPaneViews::SetFocus() {
370 // Focus the associated HWND. 370 // Focus the associated HWND.
371 OnFocus(); 371 OnFocus();
372 } 372 }
(...skipping 29 matching lines...) Expand all
402 if (tab_strip_->has_children()) 402 if (tab_strip_->has_children())
403 InitializeTabs(); 403 InitializeTabs();
404 } 404 }
405 405
406 void NativeTabbedPaneViews::InitializeTabs() { 406 void NativeTabbedPaneViews::InitializeTabs() {
407 for (int i = 0; i < tab_strip_->child_count(); ++i) 407 for (int i = 0; i < tab_strip_->child_count(); ++i)
408 content_view_->AddChildView(Tab::GetContents(tab_strip_->child_at(i))); 408 content_view_->AddChildView(Tab::GetContents(tab_strip_->child_at(i)));
409 } 409 }
410 410
411 } // namespace views 411 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698