Revert wrong maximized->tablet comment changes

Bug: 726476
Change-Id: Ifdbb411cc622ae29d38778030aa755bcc38eec2e
Reviewed-on: https://chromium-review.googlesource.com/1026849
Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553391}

chrome/browser/ui/views/frame/glass_browser_frame_view.cc

@@ -58,7 +58,7 @@ const int kContentEdgeShadowThickness = 2;
 // buttons, but the space will look cluttered if it actually slides under them,
 // so we stop it when the gap between the two is down to 5 px.
 const int kNewTabCaptionRestoredSpacing = 5;
-// In tablet mode, where the New Tab button and the caption buttons are at
+// In maximized mode, where the New Tab button and the caption buttons are at
 // similar vertical coordinates, we need to reserve a larger, 16 px gap to avoid
 // looking too cluttered.
 const int kNewTabCaptionMaximizedSpacing = 16;
@@ -158,7 +158,7 @@ gfx::Rect GlassBrowserFrameView::GetBoundsForTabStrip(
       const int old_end_x = end_x;
       end_x -= profile_switcher->width() + kProfileSwitcherButtonOffset;
 
-      // In non-tablet mode, allow the new tab button to slide completely
+      // In non-maximized mode, allow the new tab button to slide completely
       // under the profile switcher button.
       if (!IsMaximized()) {
         const int new_tab_button_width =
@@ -541,7 +541,7 @@ int GlassBrowserFrameView::TopAreaHeight(bool restored) const {
 
   const int top = FrameTopBorderThickness(restored);
   // The tab top inset is equal to the height of any shadow region above the
-  // tabs, plus a 1 px top stroke.  In tablet mode, we want to push the
+  // tabs, plus a 1 px top stroke.  In maximized mode, we want to push the
   // shadow region off the top of the screen but leave the top stroke.
   return (IsMaximized() && !restored)
              ? (top - GetLayoutInsets(TAB).top() + 1)
@@ -556,7 +556,7 @@ int GlassBrowserFrameView::TitlebarHeight(bool restored) const {
   if (frame()->IsFullscreen() && !restored)
     return 0;
   // The titlebar's actual height is the same in restored and maximized, but
-  // some of it is above the screen in tablet mode. See the comment in
+  // some of it is above the screen in maximized mode. See the comment in
   // FrameTopBorderThicknessPx().
   return TitlebarMaximizedVisualHeight() + FrameTopBorderThickness(false);
 }
@@ -770,7 +770,7 @@ void GlassBrowserFrameView::LayoutProfileSwitcher() {
 
   int button_y = WindowTopY();
   if (IsMaximized()) {
-    // In tablet mode the caption buttons appear only 19 pixels high, but
+    // In maximized mode the caption buttons appear only 19 pixels high, but
     // their contents are aligned as if they were 20 pixels high and extended
     // 1 pixel off the top of the screen. We position the profile switcher
     // button the same way to match.

chrome/browser/ui/views/frame/glass_browser_frame_view.h

@@ -116,7 +116,7 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView,
   // don't have tabs.
   int TitlebarHeight(bool restored) const;
 
-  // Returns the y coordinate for the top of the frame, which in tablet mode
+  // Returns the y coordinate for the top of the frame, which in maximized mode
   // is the top of the screen and in restored mode is 1 pixel below the top of
   // the window to leave room for the visual border that Windows draws.
   int WindowTopY() const;

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

@@ -217,7 +217,7 @@ int OpaqueBrowserFrameView::NonClientHitTest(const gfx::Point& point) {
   // See if we're in the sysmenu region.  We still have to check the tabstrip
   // first so that clicks in a tab don't get treated as sysmenu clicks.
   gfx::Rect sysmenu_rect(IconBounds());
-  // In tablet mode we extend the rect to the screen corner to take advantage
+  // In maximized mode we extend the rect to the screen corner to take advantage
   // of Fitts' Law.
   if (layout_->IsTitleBarCondensed())
     sysmenu_rect.SetRect(0, 0, sysmenu_rect.right(), sysmenu_rect.bottom());
@@ -597,7 +597,7 @@ void OpaqueBrowserFrameView::PaintClientEdge(gfx::Canvas* canvas) const {
                                         client_bounds, true);
   }
 
-  // In tablet mode, the only edge to draw is the top one, so we're done.
+  // In maximized mode, the only edge to draw is the top one, so we're done.
   if (layout_->IsTitleBarCondensed())
     return;
 

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc

@@ -172,7 +172,7 @@ int OpaqueBrowserFrameViewLayout::NonClientTopHeight(bool restored) const {
 
   int thickness = FrameBorderThickness(restored);
   // The tab top inset is equal to the height of any shadow region above the
-  // tabs, plus a 1 px top stroke.  In tablet mode, we want to push the
+  // tabs, plus a 1 px top stroke.  In maximized mode, we want to push the
   // shadow region off the top of the screen but leave the top stroke.
   if (!restored && delegate_->IsTabStripVisible() && IsTitleBarCondensed())
     thickness -= GetLayoutInsets(TAB).top() - 1;
@@ -291,7 +291,7 @@ void OpaqueBrowserFrameViewLayout::LayoutNewStyleAvatar(views::View* host) {
   minimum_size_for_buttons_ += button_width_with_offset;
   trailing_button_start_ += button_width_with_offset;
 
-  // In non-tablet mode, allow the new tab button to completely slide under
+  // In non-maximized mode, allow the new tab button to completely slide under
   // the avatar button.
   if (!IsTitleBarCondensed()) {
     trailing_button_start_ -=
@@ -514,7 +514,7 @@ void OpaqueBrowserFrameViewLayout::SetBoundsForButton(
       views::ImageButton::ALIGN_BOTTOM);
 
   // There should always be the same number of non-shadow pixels visible to the
-  // side of the caption buttons.  In tablet mode we extend buttons to the
+  // side of the caption buttons.  In maximized mode we extend buttons to the
   // screen top and the rightmost button to the screen right (or leftmost button
   // to the screen left, for left-aligned buttons) to obey Fitts' Law.
   bool title_bar_condensed = IsTitleBarCondensed();

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

@@ -584,7 +584,7 @@ void ToolbarView::Layout() {
     next_element_x = avatar_->bounds().right() + element_padding;
   }
 
-  // Extend the app menu to the screen's right edge in tablet mode just like
+  // 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 += end_padding;