| Index: chrome/browser/ui/views/reload_button.cc
|
| diff --git a/chrome/browser/ui/views/reload_button.cc b/chrome/browser/ui/views/reload_button.cc
|
| deleted file mode 100644
|
| index 11ef78e908ab5fee325a2a31cea5ddfbf4d4af71..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/ui/views/reload_button.cc
|
| +++ /dev/null
|
| @@ -1,268 +0,0 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "chrome/browser/ui/views/reload_button.h"
|
| -
|
| -#include "base/strings/utf_string_conversions.h"
|
| -#include "chrome/app/chrome_command_ids.h"
|
| -#include "chrome/browser/command_updater.h"
|
| -#include "chrome/browser/search/search.h"
|
| -#include "chrome/browser/ui/search/search_model.h"
|
| -#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
|
| -#include "grit/generated_resources.h"
|
| -#include "grit/theme_resources.h"
|
| -#include "ui/base/l10n/l10n_util.h"
|
| -#include "ui/base/models/simple_menu_model.h"
|
| -#include "ui/base/theme_provider.h"
|
| -#include "ui/base/window_open_disposition.h"
|
| -#include "ui/views/metrics.h"
|
| -#include "ui/views/widget/widget.h"
|
| -
|
| -
|
| -namespace {
|
| -
|
| -const int kReloadImages[] =
|
| - { IDR_RELOAD, IDR_RELOAD_H, IDR_RELOAD_P, IDR_RELOAD_D };
|
| -
|
| -const int kStopImages[] = { IDR_STOP, IDR_STOP_H, IDR_STOP_P, IDR_STOP_D };
|
| -
|
| -// Contents of the Reload drop-down menu.
|
| -const int kReloadMenuItems[] = {
|
| - IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM,
|
| - IDS_RELOAD_MENU_HARD_RELOAD_ITEM,
|
| - IDS_RELOAD_MENU_EMPTY_AND_HARD_RELOAD_ITEM,
|
| -};
|
| -
|
| -} // namespace
|
| -
|
| -
|
| -// ReloadButton ---------------------------------------------------------------
|
| -
|
| -// static
|
| -const char ReloadButton::kViewClassName[] = "ReloadButton";
|
| -
|
| -ReloadButton::ReloadButton(LocationBarView* location_bar,
|
| - CommandUpdater* command_updater)
|
| - : ButtonDropDown(this, CreateMenuModel()),
|
| - location_bar_(location_bar),
|
| - command_updater_(command_updater),
|
| - intended_mode_(MODE_RELOAD),
|
| - visible_mode_(MODE_RELOAD),
|
| - double_click_timer_delay_(
|
| - base::TimeDelta::FromMilliseconds(views::GetDoubleClickInterval())),
|
| - stop_to_reload_timer_delay_(base::TimeDelta::FromMilliseconds(1350)),
|
| - menu_enabled_(false),
|
| - testing_mouse_hovered_(false),
|
| - testing_reload_count_(0) {
|
| -}
|
| -
|
| -ReloadButton::~ReloadButton() {
|
| -}
|
| -
|
| -void ReloadButton::ChangeMode(Mode mode, bool force) {
|
| - intended_mode_ = mode;
|
| -
|
| - // If the change is forced, or the user isn't hovering the icon, or it's safe
|
| - // to change it to the other image type, make the change immediately;
|
| - // otherwise we'll let it happen later.
|
| - if (force || (!IsMouseHovered() && !testing_mouse_hovered_) ||
|
| - ((mode == MODE_STOP) ?
|
| - !double_click_timer_.IsRunning() : (visible_mode_ != MODE_STOP))) {
|
| - double_click_timer_.Stop();
|
| - stop_to_reload_timer_.Stop();
|
| - ChangeModeInternal(mode);
|
| - SetEnabled(true);
|
| -
|
| - // We want to disable the button if we're preventing a change from stop to
|
| - // reload due to hovering, but not if we're preventing a change from reload to
|
| - // stop due to the double-click timer running. (Disabled reload state is only
|
| - // applicable when instant extended API is enabled and mode is NTP, which is
|
| - // handled just above.)
|
| - } else if (visible_mode_ != MODE_RELOAD) {
|
| - SetEnabled(false);
|
| -
|
| - // Go ahead and change to reload after a bit, which allows repeated reloads
|
| - // without moving the mouse.
|
| - if (!stop_to_reload_timer_.IsRunning()) {
|
| - stop_to_reload_timer_.Start(FROM_HERE, stop_to_reload_timer_delay_, this,
|
| - &ReloadButton::OnStopToReloadTimer);
|
| - }
|
| - }
|
| -}
|
| -
|
| -void ReloadButton::LoadImages(ui::ThemeProvider* tp) {
|
| - DCHECK_EQ(static_cast<int>(arraysize(kReloadImages)), STATE_COUNT);
|
| - DCHECK_EQ(static_cast<int>(arraysize(kStopImages)), STATE_COUNT);
|
| -
|
| - gfx::ImageSkia* reload_images = images_;
|
| - gfx::ImageSkia* stop_images = alternate_images_;
|
| - if (visible_mode_ == MODE_STOP)
|
| - std::swap(reload_images, stop_images);
|
| -
|
| - for (int i = 0; i < STATE_COUNT; i++) {
|
| - reload_images[i] = *(tp->GetImageSkiaNamed(kReloadImages[i]));
|
| - stop_images[i] = *(tp->GetImageSkiaNamed(kStopImages[i]));
|
| - }
|
| -
|
| - SchedulePaint();
|
| - PreferredSizeChanged();
|
| -}
|
| -
|
| -void ReloadButton::OnMouseExited(const ui::MouseEvent& event) {
|
| - ButtonDropDown::OnMouseExited(event);
|
| - if (!IsMenuShowing())
|
| - ChangeMode(intended_mode_, true);
|
| -}
|
| -
|
| -bool ReloadButton::GetTooltipText(const gfx::Point& p,
|
| - string16* tooltip) const {
|
| - int reload_tooltip = menu_enabled_ ?
|
| - IDS_TOOLTIP_RELOAD_WITH_MENU : IDS_TOOLTIP_RELOAD;
|
| - int text_id = (visible_mode_ == MODE_RELOAD) ?
|
| - reload_tooltip : IDS_TOOLTIP_STOP;
|
| - tooltip->assign(l10n_util::GetStringUTF16(text_id));
|
| - return true;
|
| -}
|
| -
|
| -const char* ReloadButton::GetClassName() const {
|
| - return kViewClassName;
|
| -}
|
| -
|
| -void ReloadButton::GetAccessibleState(ui::AccessibleViewState* state) {
|
| - if (menu_enabled_)
|
| - ButtonDropDown::GetAccessibleState(state);
|
| - else
|
| - CustomButton::GetAccessibleState(state);
|
| -}
|
| -
|
| -bool ReloadButton::ShouldShowMenu() {
|
| - return menu_enabled_ && (visible_mode_ == MODE_RELOAD);
|
| -}
|
| -
|
| -void ReloadButton::ShowDropDownMenu(ui::MenuSourceType source_type) {
|
| - ButtonDropDown::ShowDropDownMenu(source_type); // Blocks.
|
| - ChangeMode(intended_mode_, true);
|
| -}
|
| -
|
| -void ReloadButton::ButtonPressed(views::Button* /* button */,
|
| - const ui::Event& event) {
|
| - ClearPendingMenu();
|
| -
|
| - if (visible_mode_ == MODE_STOP) {
|
| - if (command_updater_)
|
| - command_updater_->ExecuteCommandWithDisposition(IDC_STOP, CURRENT_TAB);
|
| - // The user has clicked, so we can feel free to update the button,
|
| - // even if the mouse is still hovering.
|
| - ChangeMode(MODE_RELOAD, true);
|
| - } else if (!double_click_timer_.IsRunning()) {
|
| - // Shift-clicking or ctrl-clicking the reload button means we should ignore
|
| - // any cached content.
|
| - int command;
|
| - int flags = event.flags();
|
| - if (event.IsShiftDown() || event.IsControlDown()) {
|
| - command = IDC_RELOAD_IGNORING_CACHE;
|
| - // Mask off Shift and Control so they don't affect the disposition below.
|
| - flags &= ~(ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
|
| - } else {
|
| - command = IDC_RELOAD;
|
| - }
|
| -
|
| - // Start a timer - while this timer is running, the reload button cannot be
|
| - // changed to a stop button. We do not set |intended_mode_| to MODE_STOP
|
| - // here as the browser will do that when it actually starts loading (which
|
| - // may happen synchronously, thus the need to do this before telling the
|
| - // browser to execute the reload command).
|
| - double_click_timer_.Start(FROM_HERE, double_click_timer_delay_, this,
|
| - &ReloadButton::OnDoubleClickTimer);
|
| -
|
| - ExecuteBrowserCommand(command, flags);
|
| - ++testing_reload_count_;
|
| - }
|
| -}
|
| -
|
| -bool ReloadButton::IsCommandIdChecked(int command_id) const {
|
| - return false;
|
| -}
|
| -
|
| -bool ReloadButton::IsCommandIdEnabled(int command_id) const {
|
| - return true;
|
| -}
|
| -
|
| -bool ReloadButton::IsCommandIdVisible(int command_id) const {
|
| - return true;
|
| -}
|
| -
|
| -bool ReloadButton::GetAcceleratorForCommandId(int command_id,
|
| - ui::Accelerator* accelerator) {
|
| - switch (command_id) {
|
| - case IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM:
|
| - GetWidget()->GetAccelerator(IDC_RELOAD, accelerator);
|
| - return true;
|
| - case IDS_RELOAD_MENU_HARD_RELOAD_ITEM:
|
| - GetWidget()->GetAccelerator(IDC_RELOAD_IGNORING_CACHE, accelerator);
|
| - return true;
|
| - }
|
| - return GetWidget()->GetAccelerator(command_id, accelerator);
|
| -}
|
| -
|
| -void ReloadButton::ExecuteCommand(int command_id, int event_flags) {
|
| - int browser_command = 0;
|
| - switch (command_id) {
|
| - case IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM:
|
| - browser_command = IDC_RELOAD;
|
| - break;
|
| - case IDS_RELOAD_MENU_HARD_RELOAD_ITEM:
|
| - browser_command = IDC_RELOAD_IGNORING_CACHE;
|
| - break;
|
| - case IDS_RELOAD_MENU_EMPTY_AND_HARD_RELOAD_ITEM:
|
| - browser_command = IDC_RELOAD_CLEARING_CACHE;
|
| - break;
|
| - default:
|
| - NOTREACHED();
|
| - }
|
| - ExecuteBrowserCommand(browser_command, event_flags);
|
| -}
|
| -
|
| -ui::SimpleMenuModel* ReloadButton::CreateMenuModel() {
|
| - ui::SimpleMenuModel* menu_model = new ui::SimpleMenuModel(this);
|
| - for (size_t i = 0; i < arraysize(kReloadMenuItems); ++i)
|
| - menu_model->AddItemWithStringId(kReloadMenuItems[i], kReloadMenuItems[i]);
|
| -
|
| - return menu_model;
|
| -}
|
| -
|
| -void ReloadButton::ExecuteBrowserCommand(int command, int event_flags) {
|
| - if (!command_updater_)
|
| - return;
|
| -
|
| - WindowOpenDisposition disposition =
|
| - ui::DispositionFromEventFlags(event_flags);
|
| - if ((disposition == CURRENT_TAB) && location_bar_) {
|
| - // Forcibly reset the location bar, since otherwise it won't discard any
|
| - // ongoing user edits, since it doesn't realize this is a user-initiated
|
| - // action.
|
| - location_bar_->Revert();
|
| - }
|
| - command_updater_->ExecuteCommandWithDisposition(command, disposition);
|
| -}
|
| -
|
| -void ReloadButton::ChangeModeInternal(Mode mode) {
|
| - if (visible_mode_ == mode)
|
| - return;
|
| -
|
| - for (size_t i = 0; i < STATE_COUNT; ++i)
|
| - std::swap(images_[i], alternate_images_[i]);
|
| - visible_mode_ = mode;
|
| - SchedulePaint();
|
| -}
|
| -
|
| -void ReloadButton::OnDoubleClickTimer() {
|
| - if (!IsMenuShowing())
|
| - ChangeMode(intended_mode_, false);
|
| -}
|
| -
|
| -void ReloadButton::OnStopToReloadTimer() {
|
| - DCHECK(!IsMenuShowing());
|
| - ChangeMode(intended_mode_, true);
|
| -}
|
|
|