Merge r12930....

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/views/frame/browser_view.h"
 
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 186 matching lines @@
 void BrowserView::SetShowState(int state) {
   explicit_show_state = state;
 }
 
 BrowserView::BrowserView(Browser* browser)
     : views::ClientView(NULL, NULL),
       frame_(NULL),
       browser_(browser),
       active_bookmark_bar_(NULL),
       active_download_shelf_(NULL),
+      tabstrip_(NULL),
       toolbar_(NULL),
       infobar_container_(NULL),
       find_bar_y_(0),
       contents_container_(NULL),
       initialized_(false),
       fullscreen_(false),
       ignore_layout_(false),
       hung_window_detector_(&hung_plugin_action_),
       ticker_(0)
 #ifdef CHROME_PERSONALIZATION
@@ skipping 1413 matching lines @@
     initialized = true;
   }
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserView* browser_view = new BrowserView(browser);
   (new BrowserFrame(browser_view))->Init();
   return browser_view;
 }