OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/views/toolbar_view.h" | 5 #include "chrome/browser/views/toolbar_view.h" |
6 | 6 |
| 7 #include <algorithm> |
7 #include <string> | 8 #include <string> |
8 | 9 |
9 #include "app/drag_drop_types.h" | 10 #include "app/drag_drop_types.h" |
10 #include "app/gfx/canvas.h" | 11 #include "app/gfx/canvas.h" |
11 #include "app/l10n_util.h" | 12 #include "app/l10n_util.h" |
12 #include "app/os_exchange_data.h" | 13 #include "app/os_exchange_data.h" |
13 #include "app/resource_bundle.h" | 14 #include "app/resource_bundle.h" |
14 #include "base/command_line.h" | 15 #include "base/command_line.h" |
15 #include "base/keyboard_codes.h" | 16 #include "base/keyboard_codes.h" |
16 #include "base/logging.h" | 17 #include "base/logging.h" |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 | 559 |
559 LoadLeftSideControlsImages(); | 560 LoadLeftSideControlsImages(); |
560 | 561 |
561 AddChildView(back_); | 562 AddChildView(back_); |
562 AddChildView(forward_); | 563 AddChildView(forward_); |
563 AddChildView(reload_); | 564 AddChildView(reload_); |
564 AddChildView(home_); | 565 AddChildView(home_); |
565 } | 566 } |
566 | 567 |
567 void ToolbarView::CreateCenterStack(Profile *profile) { | 568 void ToolbarView::CreateCenterStack(Profile *profile) { |
568 star_ = new ToolbarStarToggle(this, this); | 569 star_ = new ToolbarStarToggle(this); |
569 star_->set_tag(IDC_BOOKMARK_PAGE); | |
570 star_->SetDragController(this); | 570 star_->SetDragController(this); |
571 star_->SetTooltipText(l10n_util::GetString(IDS_TOOLTIP_STAR)); | 571 star_->set_profile(profile); |
572 star_->SetToggledTooltipText(l10n_util::GetString(IDS_TOOLTIP_STARRED)); | 572 star_->set_host_view(this); |
573 star_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_STAR)); | 573 star_->set_bubble_positioner(this); |
574 star_->SetID(VIEW_ID_STAR_BUTTON); | 574 star_->Init(); |
575 AddChildView(star_); | 575 AddChildView(star_); |
576 | 576 |
577 location_bar_ = new LocationBarView(profile, browser_->command_updater(), | 577 location_bar_ = new LocationBarView(profile, browser_->command_updater(), |
578 model_, this, | 578 model_, this, |
579 display_mode_ == DISPLAYMODE_LOCATION, | 579 display_mode_ == DISPLAYMODE_LOCATION, |
580 this); | 580 this); |
581 | 581 |
582 // The Go button. | 582 // The Go button. |
583 go_ = new GoButton(location_bar_, browser_); | 583 go_ = new GoButton(location_bar_, browser_); |
584 go_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_GO)); | 584 go_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_GO)); |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
662 home_->SetBackground(color, background, | 662 home_->SetBackground(color, background, |
663 tp->GetBitmapNamed(IDR_BUTTON_MASK)); | 663 tp->GetBitmapNamed(IDR_BUTTON_MASK)); |
664 } | 664 } |
665 | 665 |
666 void ToolbarView::LoadCenterStackImages() { | 666 void ToolbarView::LoadCenterStackImages() { |
667 ThemeProvider* tp = GetThemeProvider(); | 667 ThemeProvider* tp = GetThemeProvider(); |
668 | 668 |
669 SkColor color = tp->GetColor(BrowserThemeProvider::COLOR_BUTTON_BACKGROUND); | 669 SkColor color = tp->GetColor(BrowserThemeProvider::COLOR_BUTTON_BACKGROUND); |
670 SkBitmap* background = tp->GetBitmapNamed(IDR_THEME_BUTTON_BACKGROUND); | 670 SkBitmap* background = tp->GetBitmapNamed(IDR_THEME_BUTTON_BACKGROUND); |
671 | 671 |
672 star_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_STAR)); | |
673 star_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_STAR_H)); | |
674 star_->SetImage(views::CustomButton::BS_PUSHED, | |
675 tp->GetBitmapNamed(IDR_STAR_P)); | |
676 star_->SetImage(views::CustomButton::BS_DISABLED, | |
677 tp->GetBitmapNamed(IDR_STAR_D)); | |
678 star_->SetToggledImage(views::CustomButton::BS_NORMAL, | |
679 tp->GetBitmapNamed(IDR_STARRED)); | |
680 star_->SetToggledImage(views::CustomButton::BS_HOT, | |
681 tp->GetBitmapNamed(IDR_STARRED_H)); | |
682 star_->SetToggledImage(views::CustomButton::BS_PUSHED, | |
683 tp->GetBitmapNamed(IDR_STARRED_P)); | |
684 star_->SetBackground(color, background, | |
685 tp->GetBitmapNamed(IDR_STAR_MASK)); | |
686 | |
687 go_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_GO)); | 672 go_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_GO)); |
688 go_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_GO_H)); | 673 go_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_GO_H)); |
689 go_->SetImage(views::CustomButton::BS_PUSHED, tp->GetBitmapNamed(IDR_GO_P)); | 674 go_->SetImage(views::CustomButton::BS_PUSHED, tp->GetBitmapNamed(IDR_GO_P)); |
690 go_->SetToggledImage(views::CustomButton::BS_NORMAL, | 675 go_->SetToggledImage(views::CustomButton::BS_NORMAL, |
691 tp->GetBitmapNamed(IDR_STOP)); | 676 tp->GetBitmapNamed(IDR_STOP)); |
692 go_->SetToggledImage(views::CustomButton::BS_HOT, | 677 go_->SetToggledImage(views::CustomButton::BS_HOT, |
693 tp->GetBitmapNamed(IDR_STOP_H)); | 678 tp->GetBitmapNamed(IDR_STOP_H)); |
694 go_->SetToggledImage(views::CustomButton::BS_PUSHED, | 679 go_->SetToggledImage(views::CustomButton::BS_PUSHED, |
695 tp->GetBitmapNamed(IDR_STOP_P)); | 680 tp->GetBitmapNamed(IDR_STOP_P)); |
696 go_->SetBackground(color, background, | 681 go_->SetBackground(color, background, |
(...skipping 19 matching lines...) Expand all Loading... |
716 | 701 |
717 void ToolbarView::RunPageMenu(const gfx::Point& pt) { | 702 void ToolbarView::RunPageMenu(const gfx::Point& pt) { |
718 page_menu_model_.reset(new PageMenuModel(this, browser_)); | 703 page_menu_model_.reset(new PageMenuModel(this, browser_)); |
719 page_menu_menu_.reset(new views::Menu2(page_menu_model_.get())); | 704 page_menu_menu_.reset(new views::Menu2(page_menu_model_.get())); |
720 page_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); | 705 page_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); |
721 } | 706 } |
722 | 707 |
723 void ToolbarView::RunAppMenu(const gfx::Point& pt) { | 708 void ToolbarView::RunAppMenu(const gfx::Point& pt) { |
724 app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); | 709 app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); |
725 } | 710 } |
OLD | NEW |