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

Side by Side Diff: chrome/browser/ui/views/wrench_menu.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
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 "chrome/browser/ui/views/wrench_menu.h" 5 #include "chrome/browser/ui/views/wrench_menu.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <set> 9 #include <set>
10 10
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 decrement_button_(NULL), 510 decrement_button_(NULL),
511 fullscreen_button_(NULL), 511 fullscreen_button_(NULL),
512 zoom_label_width_(0) { 512 zoom_label_width_(0) {
513 decrement_button_ = CreateButtonWithAccName( 513 decrement_button_ = CreateButtonWithAccName(
514 IDS_ZOOM_MINUS2, MenuButtonBackground::LEFT_BUTTON, decrement_index, 514 IDS_ZOOM_MINUS2, MenuButtonBackground::LEFT_BUTTON, decrement_index,
515 NULL, IDS_ACCNAME_ZOOM_MINUS2); 515 NULL, IDS_ACCNAME_ZOOM_MINUS2);
516 516
517 zoom_label_ = new Label( 517 zoom_label_ = new Label(
518 l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, 100)); 518 l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, 100));
519 zoom_label_->SetAutoColorReadabilityEnabled(false); 519 zoom_label_->SetAutoColorReadabilityEnabled(false);
520 zoom_label_->SetHorizontalAlignment(Label::ALIGN_RIGHT); 520 zoom_label_->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
521 521
522 MenuButtonBackground* center_bg = new MenuButtonBackground( 522 MenuButtonBackground* center_bg = new MenuButtonBackground(
523 menu_->use_new_menu() && menu_->supports_new_separators_ ? 523 menu_->use_new_menu() && menu_->supports_new_separators_ ?
524 MenuButtonBackground::RIGHT_BUTTON : 524 MenuButtonBackground::RIGHT_BUTTON :
525 MenuButtonBackground::CENTER_BUTTON, 525 MenuButtonBackground::CENTER_BUTTON,
526 menu_->use_new_menu()); 526 menu_->use_new_menu());
527 zoom_label_->set_background(center_bg); 527 zoom_label_->set_background(center_bg);
528 const MenuConfig& menu_config(menu->GetMenuConfig()); 528 const MenuConfig& menu_config(menu->GetMenuConfig());
529 zoom_label_->set_border( 529 zoom_label_->set_border(
530 new MenuButtonBorder(menu_config, menu->use_new_menu())); 530 new MenuButtonBorder(menu_config, menu->use_new_menu()));
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 bookmark_menu_delegate_.reset( 1095 bookmark_menu_delegate_.reset(
1096 new BookmarkMenuDelegate(browser_, 1096 new BookmarkMenuDelegate(browser_,
1097 browser_, 1097 browser_,
1098 parent, 1098 parent,
1099 first_bookmark_command_id_)); 1099 first_bookmark_command_id_));
1100 bookmark_menu_delegate_->Init( 1100 bookmark_menu_delegate_->Init(
1101 this, bookmark_menu_, model->bookmark_bar_node(), 0, 1101 this, bookmark_menu_, model->bookmark_bar_node(), 0,
1102 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS, 1102 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
1103 bookmark_utils::LAUNCH_WRENCH_MENU); 1103 bookmark_utils::LAUNCH_WRENCH_MENU);
1104 } 1104 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/website_settings/website_settings_popup_view.cc ('k') | ui/message_center/base_format_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698