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

Side by Side Diff: chrome/browser/views/toolbar_view.cc

Issue 3198005: Disable the stop button when the user is hovering it and the page finishes lo... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/views/reload_button.cc ('k') | views/controls/button/custom_button.h » ('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) 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 "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "chrome/app/chrome_dll_resource.h" 9 #include "chrome/app/chrome_dll_resource.h"
10 #include "chrome/browser/browser.h" 10 #include "chrome/browser/browser.h"
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 reload_->SetImage(views::CustomButton::BS_HOT, 556 reload_->SetImage(views::CustomButton::BS_HOT,
557 tp->GetBitmapNamed(IDR_RELOAD_H)); 557 tp->GetBitmapNamed(IDR_RELOAD_H));
558 reload_->SetImage(views::CustomButton::BS_PUSHED, 558 reload_->SetImage(views::CustomButton::BS_PUSHED,
559 tp->GetBitmapNamed(IDR_RELOAD_P)); 559 tp->GetBitmapNamed(IDR_RELOAD_P));
560 reload_->SetToggledImage(views::CustomButton::BS_NORMAL, 560 reload_->SetToggledImage(views::CustomButton::BS_NORMAL,
561 tp->GetBitmapNamed(IDR_STOP)); 561 tp->GetBitmapNamed(IDR_STOP));
562 reload_->SetToggledImage(views::CustomButton::BS_HOT, 562 reload_->SetToggledImage(views::CustomButton::BS_HOT,
563 tp->GetBitmapNamed(IDR_STOP_H)); 563 tp->GetBitmapNamed(IDR_STOP_H));
564 reload_->SetToggledImage(views::CustomButton::BS_PUSHED, 564 reload_->SetToggledImage(views::CustomButton::BS_PUSHED,
565 tp->GetBitmapNamed(IDR_STOP_P)); 565 tp->GetBitmapNamed(IDR_STOP_P));
566 reload_->SetToggledImage(views::CustomButton::BS_DISABLED,
567 tp->GetBitmapNamed(IDR_STOP_D));
566 568
567 home_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_HOME)); 569 home_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_HOME));
568 home_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_HOME_H)); 570 home_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_HOME_H));
569 home_->SetImage(views::CustomButton::BS_PUSHED, 571 home_->SetImage(views::CustomButton::BS_PUSHED,
570 tp->GetBitmapNamed(IDR_HOME_P)); 572 tp->GetBitmapNamed(IDR_HOME_P));
571 573
572 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL)); 574 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
573 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT)); 575 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
574 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED)); 576 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
575 } 577 }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 *tp->GetBitmapNamed(IDR_UPGRADE_DOT_ACTIVE), 637 *tp->GetBitmapNamed(IDR_UPGRADE_DOT_ACTIVE),
636 value); 638 value);
637 } 639 }
638 640
639 static const int kBadgeLeftSpacing = 8; 641 static const int kBadgeLeftSpacing = 8;
640 static const int kBadgeTopSpacing = 18; 642 static const int kBadgeTopSpacing = 18;
641 canvas->DrawBitmapInt(badge, kBadgeLeftSpacing, kBadgeTopSpacing); 643 canvas->DrawBitmapInt(badge, kBadgeLeftSpacing, kBadgeTopSpacing);
642 644
643 return canvas->ExtractBitmap(); 645 return canvas->ExtractBitmap();
644 } 646 }
OLDNEW
« no previous file with comments | « chrome/browser/views/reload_button.cc ('k') | views/controls/button/custom_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698