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

Side by Side Diff: chrome/browser/ui/views/fullscreen_exit_bubble_views.cc

Issue 187133003: linux_aura: Fix all instances of LabelButton sizing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert on the right branch. Created 6 years, 9 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/ui/libgtk2ui/gtk2_border.cc ('k') | ui/views/controls/button/label_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) 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/fullscreen_exit_bubble_views.h" 5 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 void FullscreenExitBubbleViews::FullscreenExitView::UpdateContent( 217 void FullscreenExitBubbleViews::FullscreenExitView::UpdateContent(
218 const GURL& url, 218 const GURL& url,
219 FullscreenExitBubbleType bubble_type) { 219 FullscreenExitBubbleType bubble_type) {
220 DCHECK_NE(FEB_TYPE_NONE, bubble_type); 220 DCHECK_NE(FEB_TYPE_NONE, bubble_type);
221 221
222 message_label_->SetText(bubble_->GetCurrentMessageText()); 222 message_label_->SetText(bubble_->GetCurrentMessageText());
223 if (fullscreen_bubble::ShowButtonsForType(bubble_type)) { 223 if (fullscreen_bubble::ShowButtonsForType(bubble_type)) {
224 link_->SetVisible(false); 224 link_->SetVisible(false);
225 mouse_lock_exit_instruction_->SetVisible(false); 225 mouse_lock_exit_instruction_->SetVisible(false);
226 button_view_->SetVisible(true); 226 button_view_->SetVisible(true);
227 button_view_->deny_button()->SetStyle(views::Button::STYLE_BUTTON);
228 button_view_->deny_button()->SetText(bubble_->GetCurrentDenyButtonText()); 227 button_view_->deny_button()->SetText(bubble_->GetCurrentDenyButtonText());
228 button_view_->deny_button()->set_min_size(gfx::Size());
229 } else { 229 } else {
230 bool link_visible = true; 230 bool link_visible = true;
231 base::string16 accelerator; 231 base::string16 accelerator;
232 if (bubble_type == FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION || 232 if (bubble_type == FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION ||
233 bubble_type == FEB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION) { 233 bubble_type == FEB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION) {
234 accelerator = browser_fullscreen_exit_accelerator_; 234 accelerator = browser_fullscreen_exit_accelerator_;
235 } else if (bubble_type == FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION) { 235 } else if (bubble_type == FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION) {
236 accelerator = l10n_util::GetStringUTF16(IDS_APP_ESC_KEY); 236 accelerator = l10n_util::GetStringUTF16(IDS_APP_ESC_KEY);
237 } else { 237 } else {
238 link_visible = false; 238 link_visible = false;
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 const content::NotificationDetails& details) { 506 const content::NotificationDetails& details) {
507 DCHECK_EQ(chrome::NOTIFICATION_FULLSCREEN_CHANGED, type); 507 DCHECK_EQ(chrome::NOTIFICATION_FULLSCREEN_CHANGED, type);
508 UpdateForImmersiveState(); 508 UpdateForImmersiveState();
509 } 509 }
510 510
511 void FullscreenExitBubbleViews::OnWidgetVisibilityChanged( 511 void FullscreenExitBubbleViews::OnWidgetVisibilityChanged(
512 views::Widget* widget, 512 views::Widget* widget,
513 bool visible) { 513 bool visible) {
514 UpdateMouseWatcher(); 514 UpdateMouseWatcher();
515 } 515 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_border.cc ('k') | ui/views/controls/button/label_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698