Views - init less stuff in tabless browsers.

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 2013 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/ui/views/toolbar/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 104 matching lines @@
 
 }  // namespace
 
 // static
 const char ToolbarView::kViewClassName[] = "ToolbarView";
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, public:
 
 ToolbarView::ToolbarView(Browser* browser)
-    : back_(NULL),
-      forward_(NULL),
-      reload_(NULL),
-      home_(NULL),
-      location_bar_(NULL),
-      browser_actions_(NULL),
-      app_menu_button_(NULL),
+    : back_(nullptr),
+      forward_(nullptr),
+      reload_(nullptr),
+      home_(nullptr),
+      location_bar_(nullptr),
+      browser_actions_(nullptr),
+      app_menu_button_(nullptr),
       browser_(browser),
-      badge_controller_(browser->profile(), this) {
+      badge_controller_(browser->profile(), this),
+      display_mode_(browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)
+                        ? DISPLAYMODE_NORMAL
+                        : DISPLAYMODE_LOCATION) {
   set_id(VIEW_ID_TOOLBAR);
 
   SetEventTargeter(
       scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 
   chrome::AddCommandObserver(browser_, IDC_BACK, this);
   chrome::AddCommandObserver(browser_, IDC_FORWARD, this);
   chrome::AddCommandObserver(browser_, IDC_RELOAD, this);
   chrome::AddCommandObserver(browser_, IDC_HOME, this);
   chrome::AddCommandObserver(browser_, IDC_LOAD_NEW_TAB_PAGE, this);
 
-  display_mode_ = DISPLAYMODE_LOCATION;
-  if (browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP))
-    display_mode_ = DISPLAYMODE_NORMAL;
-
   if (OutdatedUpgradeBubbleView::IsAvailable()) {
     registrar_.Add(this, chrome::NOTIFICATION_OUTDATED_INSTALL,
                    content::NotificationService::AllSources());
     registrar_.Add(this, chrome::NOTIFICATION_OUTDATED_INSTALL_NO_AU,
                    content::NotificationService::AllSources());
   }
 #if defined(OS_WIN)
   registrar_.Add(this, chrome::NOTIFICATION_CRITICAL_UPGRADE_INSTALLED,
                  content::NotificationService::AllSources());
 #endif
 }
 
 ToolbarView::~ToolbarView() {
   // NOTE: Don't remove the command observers here.  This object gets destroyed
   // after the Browser (which owns the CommandUpdater), so the CommandUpdater is
   // already gone.
 }
 
 void ToolbarView::Init() {
+  location_bar_ = new LocationBarView(
+      browser_, browser_->profile(),
+      browser_->command_controller()->command_updater(), this,
+      !is_display_mode_normal());
+
+  if (!is_display_mode_normal()) {
+    AddChildView(location_bar_);
+    location_bar_->Init();
+    return;
+  }
+
   GetWidget()->AddObserver(this);

[Peter Kasting, 2016/02/03 00:02:08]

Don't we still need to do this?  It seems like without this, keybindings for
browser actions won't work in popup windows.  I realize we're not displaying the
icons for these, but I would have assumed you could still trigger them via these
keybindings today.  Is that not true?

[Evan Stade, 2016/02/03 00:04:36]

+Devlin to answer that

I kind of assumed that if that worked it was a bug. Devlin, does it work and
should that behavior be preserved?

[Devlin, 2016/02/03 01:02:41]

Yes, it works, and ideally, yes, it should be preserved.

[Evan Stade, 2016/02/03 01:21:44]

do you have an example of an extension that uses this? I don't know why this
keybinding registry thing is part of BrowserActionsContainer. I would have
assumed it was somehow related to browser actions, but it appears to be relevant
for all extensions.

[Devlin, 2016/02/03 02:50:43]

Any extension can have a keybinding associated with it, so this is helpful for
extensions that, e.g., inject a script on a page when they are triggered.

 
   back_ = new BackButton(
       browser_->profile(), this,
       new BackForwardMenuModel(browser_, BackForwardMenuModel::BACKWARD_MENU));
   back_->set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON);
   back_->set_tag(IDC_BACK);
   back_->SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_BACK));
   back_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_BACK));
   back_->set_id(VIEW_ID_BACK_BUTTON);
   back_->Init();
 
   forward_ = new ToolbarButton(
       browser_->profile(), this,
       new BackForwardMenuModel(browser_, BackForwardMenuModel::FORWARD_MENU));
   forward_->set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON);
   forward_->set_tag(IDC_FORWARD);
   forward_->SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_FORWARD));
   forward_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FORWARD));
   forward_->set_id(VIEW_ID_FORWARD_BUTTON);
   forward_->Init();
 
-  location_bar_ = new LocationBarView(
-      browser_, browser_->profile(),
-      browser_->command_controller()->command_updater(), this,
-      display_mode_ == DISPLAYMODE_LOCATION);
-
   reload_ = new ReloadButton(browser_->profile(),
                              browser_->command_controller()->command_updater());
   reload_->set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON);
   reload_->set_tag(IDC_RELOAD);
   reload_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_RELOAD));
   reload_->set_id(VIEW_ID_RELOAD_BUTTON);
   reload_->Init();
 
   home_ = new HomeButton(this, browser_);
@@ skipping 275 matching lines @@
 gfx::Size ToolbarView::GetPreferredSize() const {
   return GetSizeInternal(&View::GetPreferredSize);
 }
 
 gfx::Size ToolbarView::GetMinimumSize() const {
   return GetSizeInternal(&View::GetMinimumSize);
 }
 
 void ToolbarView::Layout() {
   // If we have not been initialized yet just do nothing.
-  if (back_ == NULL)
+  if (!location_bar_)
     return;
 
   if (!is_display_mode_normal()) {
     location_bar_->SetBounds(0, PopupTopSpacing(), width(),
                              location_bar_->GetPreferredSize().height());
     return;
   }
 
   // We assume all child elements except the location bar are the same height.
   // Set child_y such that buttons appear vertically centered.
@@ skipping 88 matching lines @@
   // Extend the app menu to the screen's right edge in maximized mode just like
   // we extend the back button to the left edge.
   if (maximized)
     app_menu_width += insets.right();
   app_menu_button_->SetBounds(next_element_x, child_y, app_menu_width,
                               child_height);
   app_menu_button_->SetTrailingMargin(maximized ? insets.right() : 0);
 }
 
 void ToolbarView::OnThemeChanged() {
-  LoadImages();
+  if (is_display_mode_normal())
+    LoadImages();
 }
 
 const char* ToolbarView::GetClassName() const {
   return kViewClassName;
 }
 
 bool ToolbarView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   const views::View* focused_view = focus_manager()->GetFocusedView();
   if (focused_view && (focused_view->id() == VIEW_ID_OMNIBOX))
     return false;  // Let the omnibox handle all accelerator events.
@@ skipping 199 matching lines @@
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return GetLayoutConstant(
       (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ?
           TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT);
 }