| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/first_run_bubble.h" | 5 #include "chrome/browser/ui/views/first_run_bubble.h" | 
| 6 | 6 | 
| 7 #include "app/gfx/font_util.h" | 7 #include "app/gfx/font_util.h" | 
| 8 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" | 
| 9 #include "app/resource_bundle.h" | 9 #include "app/resource_bundle.h" | 
| 10 #include "app/win/hwnd_util.h" |  | 
| 11 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" | 
| 12 #include "chrome/browser/browser_list.h" | 11 #include "chrome/browser/browser_list.h" | 
| 13 #include "chrome/browser/browser_window.h" | 12 #include "chrome/browser/browser_window.h" | 
| 14 #include "chrome/browser/first_run/first_run.h" | 13 #include "chrome/browser/first_run/first_run.h" | 
| 15 #include "chrome/browser/search_engines/util.h" | 14 #include "chrome/browser/search_engines/util.h" | 
| 16 #include "chrome/browser/metrics/user_metrics.h" | 15 #include "chrome/browser/metrics/user_metrics.h" | 
| 17 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" | 
| 18 #include "grit/chromium_strings.h" | 17 #include "grit/chromium_strings.h" | 
| 19 #include "grit/generated_resources.h" | 18 #include "grit/generated_resources.h" | 
| 20 #include "grit/locale_settings.h" | 19 #include "grit/locale_settings.h" | 
| 21 #include "grit/theme_resources.h" | 20 #include "grit/theme_resources.h" | 
|  | 21 #include "ui/base/win/hwnd_util.h" | 
| 22 #include "views/event.h" | 22 #include "views/event.h" | 
| 23 #include "views/controls/button/native_button.h" | 23 #include "views/controls/button/native_button.h" | 
| 24 #include "views/controls/button/image_button.h" | 24 #include "views/controls/button/image_button.h" | 
| 25 #include "views/controls/label.h" | 25 #include "views/controls/label.h" | 
| 26 #include "views/focus/focus_manager.h" | 26 #include "views/focus/focus_manager.h" | 
| 27 #include "views/standard_layout.h" | 27 #include "views/standard_layout.h" | 
| 28 #include "views/window/window.h" | 28 #include "views/window/window.h" | 
| 29 | 29 | 
| 30 namespace { | 30 namespace { | 
| 31 | 31 | 
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 351       gfx::GetLocalizedContentsHeightForFont( | 351       gfx::GetLocalizedContentsHeightForFont( | 
| 352           IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES, font)); | 352           IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES, font)); | 
| 353 | 353 | 
| 354   // WARNING: HACK. Vista and XP calculate font size differently; this means | 354   // WARNING: HACK. Vista and XP calculate font size differently; this means | 
| 355   // that a dialog box correctly proportioned for XP will appear too large in | 355   // that a dialog box correctly proportioned for XP will appear too large in | 
| 356   // Vista. The correct thing to do is to change font size calculations in | 356   // Vista. The correct thing to do is to change font size calculations in | 
| 357   // XP or Vista so that the length of a string is calculated properly. For | 357   // XP or Vista so that the length of a string is calculated properly. For | 
| 358   // now, we force Vista to show a correctly-sized box by taking account of | 358   // now, we force Vista to show a correctly-sized box by taking account of | 
| 359   // the difference in font size calculation. The coefficient should not be | 359   // the difference in font size calculation. The coefficient should not be | 
| 360   // stored in a variable because it's a hack and should go away. | 360   // stored in a variable because it's a hack and should go away. | 
| 361   if (app::win::ShouldUseVistaFrame()) { | 361   if (ui::ShouldUseVistaFrame()) { | 
| 362     size.set_width(static_cast<int>(size.width() * 0.85)); | 362     size.set_width(static_cast<int>(size.width() * 0.85)); | 
| 363     size.set_height(static_cast<int>(size.height() * 0.85)); | 363     size.set_height(static_cast<int>(size.height() * 0.85)); | 
| 364   } | 364   } | 
| 365   return size; | 365   return size; | 
| 366 } | 366 } | 
| 367 | 367 | 
| 368 void FirstRunOEMBubbleView::FocusWillChange(View* focused_before, | 368 void FirstRunOEMBubbleView::FocusWillChange(View* focused_before, | 
| 369                                             View* focused_now) { | 369                                             View* focused_now) { | 
| 370   // No buttons in oem_bubble to register focus changes. | 370   // No buttons in oem_bubble to register focus changes. | 
| 371 } | 371 } | 
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 538   if (::IsWindowEnabled(GetParent())) | 538   if (::IsWindowEnabled(GetParent())) | 
| 539     InfoBubble::OnActivate(action, minimized, window); | 539     InfoBubble::OnActivate(action, minimized, window); | 
| 540 } | 540 } | 
| 541 | 541 | 
| 542 void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble, | 542 void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble, | 
| 543                                        bool closed_by_escape) { | 543                                        bool closed_by_escape) { | 
| 544   // Make sure our parent window is re-enabled. | 544   // Make sure our parent window is re-enabled. | 
| 545   if (!IsWindowEnabled(GetParent())) | 545   if (!IsWindowEnabled(GetParent())) | 
| 546     ::EnableWindow(GetParent(), true); | 546     ::EnableWindow(GetParent(), true); | 
| 547 } | 547 } | 
| OLD | NEW | 
|---|