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

Side by Side Diff: chrome/browser/views/notifications/balloon_view.cc

Issue 3311006: Remove the border around the wrench icon on notification balloons (Windows).... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 3 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 | « no previous file | no next file » | 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/notifications/balloon_view.h" 5 #include "chrome/browser/views/notifications/balloon_view.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 rb.GetBitmapNamed(IDR_TAB_CLOSE_P)); 339 rb.GetBitmapNamed(IDR_TAB_CLOSE_P));
340 close_button_->SetBounds(GetCloseButtonBounds()); 340 close_button_->SetBounds(GetCloseButtonBounds());
341 close_button_->SetBackground(SK_ColorBLACK, 341 close_button_->SetBackground(SK_ColorBLACK,
342 rb.GetBitmapNamed(IDR_TAB_CLOSE), 342 rb.GetBitmapNamed(IDR_TAB_CLOSE),
343 rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK)); 343 rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK));
344 344
345 options_menu_button_->SetIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH)); 345 options_menu_button_->SetIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH));
346 options_menu_button_->SetHoverIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH_H)); 346 options_menu_button_->SetHoverIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH_H));
347 options_menu_button_->SetPushedIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH_P)); 347 options_menu_button_->SetPushedIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH_P));
348 options_menu_button_->set_alignment(views::TextButton::ALIGN_CENTER); 348 options_menu_button_->set_alignment(views::TextButton::ALIGN_CENTER);
349 options_menu_button_->set_border(NULL);
349 options_menu_button_->SetBounds(GetOptionsButtonBounds()); 350 options_menu_button_->SetBounds(GetOptionsButtonBounds());
350 351
351 source_label_->SetFont(rb.GetFont(ResourceBundle::SmallFont)); 352 source_label_->SetFont(rb.GetFont(ResourceBundle::SmallFont));
352 source_label_->SetColor(kControlBarTextColor); 353 source_label_->SetColor(kControlBarTextColor);
353 source_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 354 source_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
354 source_label_->SetBounds(GetLabelBounds()); 355 source_label_->SetBounds(GetLabelBounds());
355 356
356 SizeContentsWindow(); 357 SizeContentsWindow();
357 html_container_->Show(); 358 html_container_->Show();
358 frame_container_->Show(); 359 frame_container_->Show();
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 NOTREACHED(); 493 NOTREACHED();
493 return; 494 return;
494 } 495 }
495 496
496 // If the renderer process attached to this balloon is disconnected 497 // If the renderer process attached to this balloon is disconnected
497 // (e.g., because of a crash), we want to close the balloon. 498 // (e.g., because of a crash), we want to close the balloon.
498 notification_registrar_.Remove(this, 499 notification_registrar_.Remove(this,
499 NotificationType::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon_)); 500 NotificationType::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon_));
500 Close(false); 501 Close(false);
501 } 502 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698