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

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

Issue 6901058: Increase infobar height and infobar button height for touch. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Undo inadvertant merge changes (hopefully). Created 9 years, 7 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
OLDNEW
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 "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/first_run/first_run.h" 8 #include "chrome/browser/first_run/first_run.h"
9 #include "chrome/browser/search_engines/util.h" 9 #include "chrome/browser/search_engines/util.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_list.h" 11 #include "chrome/browser/ui/browser_list.h"
12 #include "chrome/browser/ui/browser_window.h" 12 #include "chrome/browser/ui/browser_window.h"
13 #include "content/browser/user_metrics.h" 13 #include "content/browser/user_metrics.h"
14 #include "grit/chromium_strings.h" 14 #include "grit/chromium_strings.h"
15 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
16 #include "grit/locale_settings.h" 16 #include "grit/locale_settings.h"
17 #include "grit/theme_resources.h" 17 #include "grit/theme_resources_standard.h"
18 #include "ui/base/l10n/l10n_font_util.h" 18 #include "ui/base/l10n/l10n_font_util.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
21 #include "views/controls/button/image_button.h" 21 #include "views/controls/button/image_button.h"
22 #include "views/controls/button/native_button.h" 22 #include "views/controls/button/native_button.h"
23 #include "views/controls/label.h" 23 #include "views/controls/label.h"
24 #include "views/events/event.h" 24 #include "views/events/event.h"
25 #include "views/focus/focus_manager.h" 25 #include "views/focus/focus_manager.h"
26 #include "views/layout/layout_constants.h" 26 #include "views/layout/layout_constants.h"
27 #include "views/widget/widget_win.h" 27 #include "views/widget/widget_win.h"
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 // Keep window from automatically closing until kLingerTime has passed. 537 // Keep window from automatically closing until kLingerTime has passed.
538 if (::IsWindowEnabled(GetParent())) 538 if (::IsWindowEnabled(GetParent()))
539 Bubble::OnActivate(action, minimized, window); 539 Bubble::OnActivate(action, minimized, window);
540 } 540 }
541 541
542 void FirstRunBubble::BubbleClosing(Bubble* bubble, bool closed_by_escape) { 542 void FirstRunBubble::BubbleClosing(Bubble* bubble, bool closed_by_escape) {
543 // Make sure our parent window is re-enabled. 543 // Make sure our parent window is re-enabled.
544 if (!IsWindowEnabled(GetParent())) 544 if (!IsWindowEnabled(GetParent()))
545 ::EnableWindow(GetParent(), true); 545 ::EnableWindow(GetParent(), true);
546 } 546 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698