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

Side by Side Diff: ash/wm/maximize_bubble_controller.cc

Issue 11377005: Replace Label::Alignment with gfx::HorizontalAlignment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix remaining Label::Alignment references. Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/system/user/tray_user.cc ('k') | chrome/browser/chromeos/enrollment_dialog_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/maximize_bubble_controller.h" 5 #include "ash/wm/maximize_bubble_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/wm/window_animations.h" 9 #include "ash/wm/window_animations.h"
10 #include "ash/wm/workspace/frame_maximize_button.h" 10 #include "ash/wm/workspace/frame_maximize_button.h"
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 SetLayoutManager(new views::BoxLayout( 688 SetLayoutManager(new views::BoxLayout(
689 views::BoxLayout::kVertical, 0, 0, kLayoutSpacing)); 689 views::BoxLayout::kVertical, 0, 0, kLayoutSpacing));
690 set_background( 690 set_background(
691 views::Background::CreateSolidBackground(kBubbleBackgroundColor)); 691 views::Background::CreateSolidBackground(kBubbleBackgroundColor));
692 692
693 buttons_view_ = new BubbleContentsButtonRow(bubble); 693 buttons_view_ = new BubbleContentsButtonRow(bubble);
694 AddChildView(buttons_view_); 694 AddChildView(buttons_view_);
695 695
696 label_view_ = new views::Label(); 696 label_view_ = new views::Label();
697 SetSnapType(SNAP_NONE); 697 SetSnapType(SNAP_NONE);
698 label_view_->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
699 label_view_->SetBackgroundColor(kBubbleBackgroundColor); 698 label_view_->SetBackgroundColor(kBubbleBackgroundColor);
700 label_view_->SetEnabledColor(kBubbleTextColor); 699 label_view_->SetEnabledColor(kBubbleTextColor);
701 label_view_->set_border(views::Border::CreateEmptyBorder( 700 label_view_->set_border(views::Border::CreateEmptyBorder(
702 kLabelSpacing, 0, kLabelSpacing, 0)); 701 kLabelSpacing, 0, kLabelSpacing, 0));
703 AddChildView(label_view_); 702 AddChildView(label_view_);
704 } 703 }
705 704
706 // Set the label content to reflect the currently selected |snap_type|. 705 // Set the label content to reflect the currently selected |snap_type|.
707 // This function can be executed through the frame maximize button as well as 706 // This function can be executed through the frame maximize button as well as
708 // through hover operations. 707 // through hover operations.
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 if (!GetBoundsInScreen().Contains(screen_location)) 854 if (!GetBoundsInScreen().Contains(screen_location))
856 button_row_->ButtonHovered(NULL); 855 button_row_->ButtonHovered(NULL);
857 else 856 else
858 button_row_->ButtonHovered(this); 857 button_row_->ButtonHovered(this);
859 858
860 // Pass the event on to the normal handler. 859 // Pass the event on to the normal handler.
861 return views::ImageButton::OnMouseDragged(event); 860 return views::ImageButton::OnMouseDragged(event);
862 } 861 }
863 862
864 } // namespace ash 863 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/user/tray_user.cc ('k') | chrome/browser/chromeos/enrollment_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698