Make hosted app windows enable the toolbar for streamlined hosted apps.

The work in this CL is behind the enable-streamlined-hosted-apps flag.

This CL enables the toolbar for hosted apps. In order to do this, the
BrowserNonClientViews were made to handle having the toolbar without
the tabstrip.

BUG=

Review URL: https://codereview.chromium.org/26856003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228887 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 68 insertions, 40 deletions

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 8a7a379..799f03c 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2150,7 +2150,8 @@ bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
     if (is_type_tabbed())
       features |= FEATURE_TOOLBAR;
 
-    if (!is_app())
+    if (!is_app() || CommandLine::ForCurrentProcess()->HasSwitch(
+                         switches::kEnableStreamlinedHostedApps))
       features |= FEATURE_LOCATIONBAR;
   }
   return !!(features & feature);
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
index bc69baa..b482292 100644
--- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
+#include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
@@ -124,6 +125,8 @@ gfx::Rect GlassBrowserFrameView::GetBoundsForTabStrip(
 
 BrowserNonClientFrameView::TabStripInsets
 GlassBrowserFrameView::GetTabStripInsets(bool restored) const {
+  if (!browser_view()->IsTabStripVisible())
+    return TabStripInsets();
   // TODO: include OTR and caption.
   return TabStripInsets(NonClientTopBorderHeight(restored), 0, 0);
 }
@@ -233,10 +236,9 @@ int GlassBrowserFrameView::NonClientHitTest(const gfx::Point& point) {
 // GlassBrowserFrameView, views::View overrides:
 
 void GlassBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
-  if (!browser_view()->IsTabStripVisible())
-    return;  // Nothing is visible, so don't bother to paint.
-
-  PaintToolbarBackground(canvas);
+  if (browser_view()->IsToolbarVisible() &&
+      browser_view()->toolbar()->ShouldPaintBackground())
+    PaintToolbarBackground(canvas);
   if (!frame()->IsMaximized())
     PaintRestoredClientEdge(canvas);
 }
@@ -300,42 +302,46 @@ void GlassBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) {
   // Tile the toolbar image starting at the frame edge on the left and where
   // the tabstrip is on the top.
   int y = toolbar_bounds.y();
-  int dest_y = y + (kFrameShadowThickness * 2);
+  int dest_y = browser_view()->IsTabStripVisible()
+                   ? y + (kFrameShadowThickness * 2)
+                   : y;
   canvas->TileImageInt(*theme_toolbar,
                        x + GetThemeBackgroundXInset(),
                        dest_y - GetTabStripInsets(false).top, x,
                        dest_y, w, theme_toolbar->height());
 
-  // Draw rounded corners for the tab.
-  gfx::ImageSkia* toolbar_left_mask =
-      tp->GetImageSkiaNamed(IDR_CONTENT_TOP_LEFT_CORNER_MASK);
-  gfx::ImageSkia* toolbar_right_mask =
-      tp->GetImageSkiaNamed(IDR_CONTENT_TOP_RIGHT_CORNER_MASK);
-
-  // We mask out the corners by using the DestinationIn transfer mode,
-  // which keeps the RGB pixels from the destination and the alpha from
-  // the source.
-  SkPaint paint;
-  paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
-
-  // Mask out the top left corner.
-  canvas->DrawImageInt(*toolbar_left_mask, left_x, y, paint);
-
-  // Mask out the top right corner.
-  int right_x =
-      x + w + kContentEdgeShadowThickness - toolbar_right_mask->width();
-  canvas->DrawImageInt(*toolbar_right_mask, right_x, y, paint);
-
-  // Draw left edge.
-  canvas->DrawImageInt(*toolbar_left, left_x, y);
-
-  // Draw center edge.
-  canvas->TileImageInt(*toolbar_center, left_x + toolbar_left->width(), y,
-      right_x - (left_x + toolbar_left->width()), toolbar_center->height());
-
-  // Right edge.
-  canvas->DrawImageInt(*tp->GetImageSkiaNamed(IDR_CONTENT_TOP_RIGHT_CORNER),
-                       right_x, y);
+  if (browser_view()->IsTabStripVisible()) {
+    // Draw rounded corners for the tab.
+    gfx::ImageSkia* toolbar_left_mask =
+        tp->GetImageSkiaNamed(IDR_CONTENT_TOP_LEFT_CORNER_MASK);
+    gfx::ImageSkia* toolbar_right_mask =
+        tp->GetImageSkiaNamed(IDR_CONTENT_TOP_RIGHT_CORNER_MASK);
+
+    // We mask out the corners by using the DestinationIn transfer mode,
+    // which keeps the RGB pixels from the destination and the alpha from
+    // the source.
+    SkPaint paint;
+    paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
+
+    // Mask out the top left corner.
+    canvas->DrawImageInt(*toolbar_left_mask, left_x, y, paint);
+
+    // Mask out the top right corner.
+    int right_x =
+        x + w + kContentEdgeShadowThickness - toolbar_right_mask->width();
+    canvas->DrawImageInt(*toolbar_right_mask, right_x, y, paint);
+
+    // Draw left edge.
+    canvas->DrawImageInt(*toolbar_left, left_x, y);
+
+    // Draw center edge.
+    canvas->TileImageInt(*toolbar_center, left_x + toolbar_left->width(), y,
+        right_x - (left_x + toolbar_left->width()), toolbar_center->height());
+
+    // Right edge.
+    canvas->DrawImageInt(*tp->GetImageSkiaNamed(IDR_CONTENT_TOP_RIGHT_CORNER),
+                         right_x, y);
+  }
 
   // Draw the content/toolbar separator.
   canvas->FillRect(
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index afd8977..fdfe4c7 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -176,6 +176,8 @@ gfx::Rect OpaqueBrowserFrameView::GetBoundsForTabStrip(
 
 BrowserNonClientFrameView::TabStripInsets
 OpaqueBrowserFrameView::GetTabStripInsets(bool restored) const {
+  if (!browser_view()->IsTabStripVisible())
+    return TabStripInsets();
   // TODO: include OTR and caption.
   return TabStripInsets(layout_->GetTabStripInsetsTop(restored), 0, 0);
 }
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 02adf5a..6528681 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -492,7 +492,8 @@ class LocationBarView : public LocationBar,
   // The star.
   StarView* star_view_;
 
-  // Whether we're in popup mode.
+  // Whether we're in popup mode. This value also controls whether the location
+  // bar is read-only.
   const bool is_popup_mode_;
 
   // True if we should show a focus rect while the location entry field is
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 20e8156..8ac94c0 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/views/toolbar_view.h"
 
+#include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/number_formatting.h"
 #include "base/prefs/pref_service.h"
@@ -35,6 +36,7 @@
 #include "chrome/browser/ui/views/wrench_menu.h"
 #include "chrome/browser/ui/views/wrench_toolbar_button.h"
 #include "chrome/browser/upgrade_detector.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/notification_service.h"
@@ -100,6 +102,11 @@ int GetButtonSpacing() {
       ToolbarView::kStandardSpacing : 0;
 }
 
+bool IsStreamlinedHostedAppsEnabled() {
+  return CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableStreamlinedHostedApps);
+}
+
 }  // namespace
 
 // static
@@ -131,8 +138,10 @@ ToolbarView::ToolbarView(Browser* browser)
   chrome::AddCommandObserver(browser_, IDC_HOME, this);
   chrome::AddCommandObserver(browser_, IDC_LOAD_NEW_TAB_PAGE, this);
 
-  display_mode_ = browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP) ?
-      DISPLAYMODE_NORMAL : DISPLAYMODE_LOCATION;
+  display_mode_ = DISPLAYMODE_LOCATION;
+  if (browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP) ||
+      (browser->is_app() && IsStreamlinedHostedAppsEnabled()))
+    display_mode_ = DISPLAYMODE_NORMAL;
 
   registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                  content::NotificationService::AllSources());
@@ -187,7 +196,8 @@ void ToolbarView::Init() {
   location_bar_ = new LocationBarView(
       browser_, browser_->profile(),
       browser_->command_controller()->command_updater(), this,
-      display_mode_ == DISPLAYMODE_LOCATION);
+      display_mode_ == DISPLAYMODE_LOCATION ||
+          (browser_->is_app() && IsStreamlinedHostedAppsEnabled()));
 
   reload_ = new ReloadButton(location_bar_,
                              browser_->command_controller()->command_updater());
@@ -634,6 +644,10 @@ bool ToolbarView::IsWrenchMenuShowing() const {
   return wrench_menu_.get() && wrench_menu_->IsShowing();
 }
 
+bool ToolbarView::ShouldPaintBackground() const {
+  return display_mode_ == DISPLAYMODE_NORMAL;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, protected:
 
diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h
index c36801a..a146d0f 100644
--- a/chrome/browser/ui/views/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar_view.h
@@ -140,6 +140,10 @@ class ToolbarView : public views::AccessiblePaneView,
   // Whether the wrench/hotdogs menu is currently showing.
   bool IsWrenchMenuShowing() const;
 
+  // Whether the toolbar view needs its background painted by the
+  // BrowserNonClientFrameView.
+  bool ShouldPaintBackground() const;
+
   // The apparent horizontal space between most items, and the vertical padding
   // above and below them.
   static const int kStandardSpacing;