Fixed crash when a SinglesplitView gets embdedded inside SingleSplitView

views/examples/examples_main.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/examples/examples_main.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/examples/button_example.h"
 #include "views/examples/combobox_example.h"
+#include "views/examples/double_split_view_example.h"
 #include "views/examples/link_example.h"
 #include "views/examples/menu_example.h"
 #include "views/examples/message_box_example.h"
 #include "views/examples/native_theme_button_example.h"
 #include "views/examples/native_theme_checkbox_example.h"
 #include "views/examples/native_widget_views_example.h"
 #include "views/examples/radio_button_example.h"
 #include "views/examples/scroll_view_example.h"
 #include "views/examples/single_split_view_example.h"
 #include "views/examples/tabbed_pane_example.h"
@@ skipping 72 matching lines @@
   layout->StartRow(1, 0);
   layout->AddView(tabbed_pane);
   layout->StartRow(0 /* no expand */, 0);
   layout->AddView(status_label_);
 
   // TODO(satorux): The window is getting wide.  Eventually, we would have
   // the second tabbed pane.
   views::Widget* window =
       views::Widget::CreateWindowWithBounds(this, gfx::Rect(0, 0, 850, 300));
 
+
   examples::NativeThemeCheckboxExample native_theme_checkbox_example(this);
   tabbed_pane->AddTab(native_theme_checkbox_example.GetExampleTitle(),
                       native_theme_checkbox_example.GetExampleView());
 
+  examples::DoubleSplitViewExample double_split_view_example(this);
+  tabbed_pane->AddTab(double_split_view_example.GetExampleTitle(),
+                      double_split_view_example.GetExampleView());
+
   examples::NativeThemeButtonExample native_theme_button_example(this);
   tabbed_pane->AddTab(native_theme_button_example.GetExampleTitle(),
                       native_theme_button_example.GetExampleView());
 
   examples::NativeWidgetViewsExample native_widget_views_example(this);
   tabbed_pane->AddTab(native_widget_views_example.GetExampleTitle(),
                       native_widget_views_example.GetExampleView());
 
   examples::TextfieldExample textfield_example(this);
   tabbed_pane->AddTab(textfield_example.GetExampleTitle(),
@@ skipping 28 matching lines @@
                       radio_button_example.GetExampleView());
 
   examples::ScrollViewExample scroll_view_example(this);
   tabbed_pane->AddTab(scroll_view_example.GetExampleTitle(),
                       scroll_view_example.GetExampleView());
 
   examples::SingleSplitViewExample single_split_view_example(this);
   tabbed_pane->AddTab(single_split_view_example.GetExampleTitle(),
                       single_split_view_example.GetExampleView());
 
+

[sky, 2011/09/08 14:27:11]

remove both of these lines.

[Gajen, 2011/09/09 13:58:02]

Done.

+
 #if defined(OS_WIN)
   examples::TableExample table_example(this);
   tabbed_pane->AddTab(table_example.GetExampleTitle(),
                       table_example.GetExampleView());
 #endif
 
   examples::Table2Example table2_example(this);
   tabbed_pane->AddTab(table2_example.GetExampleTitle(),
                       table2_example.GetExampleView());
 
@@ skipping 31 matching lines @@
         CommandLine::ForCurrentProcess()->HasSwitch("use-pure-views"));
 
   examples::ExamplesMain main;
   main.Run();
 
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
   return 0;
 }