Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

Issue 13139004: Deprecate Browser::TYPE_PANEL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index ed90ef0aff0c72403e051415846ea961e79e1bc3..03493a0c595c25ace986adf120f5a4c35def2e2c 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -85,15 +85,8 @@ BrowserNonClientFrameViewAsh::~BrowserNonClientFrameViewAsh() {
void BrowserNonClientFrameViewAsh::Init() {
// Panels only minimize.
ash::FramePainter::SizeButtonBehavior size_button_behavior;
- if (browser_view()->browser()->is_type_panel() &&
- browser_view()->browser()->app_type() == Browser::APP_TYPE_CHILD) {
- size_button_minimizes_ = true;
- size_button_ = new views::ImageButton(this);
- size_button_behavior = ash::FramePainter::SIZE_BUTTON_MINIMIZES;
- } else {
- size_button_ = new ash::FrameMaximizeButton(this, this);
- size_button_behavior = ash::FramePainter::SIZE_BUTTON_MAXIMIZES;
- }
+ size_button_ = new ash::FrameMaximizeButton(this, this);
+ size_button_behavior = ash::FramePainter::SIZE_BUTTON_MAXIMIZES;
size_button_->SetAccessibleName(
l10n_util::GetStringUTF16(IDS_ACCNAME_MAXIMIZE));
AddChildView(size_button_);
@@ -368,8 +361,6 @@ bool BrowserNonClientFrameViewAsh::UseShortHeader() const {
return frame()->IsMaximized() || frame()->IsFullscreen();
case Browser::TYPE_POPUP:
return false;
- case Browser::TYPE_PANEL:
- return true;
default:
NOTREACHED();
return false;

Powered by Google App Engine
This is Rietveld 408576698