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

Side by Side Diff: chrome/browser/ui/views/frame/app_panel_browser_frame_view.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/frame/app_panel_browser_frame_view.h" 5 #include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/ui/views/frame/browser_frame.h" 9 #include "chrome/browser/ui/views/frame/browser_frame.h"
10 #include "chrome/browser/ui/views/frame/browser_view.h" 10 #include "chrome/browser/ui/views/frame/browser_view.h"
11 #include "content/browser/tab_contents/tab_contents.h" 11 #include "content/browser/tab_contents/tab_contents.h"
12 #include "grit/app_resources.h" 12 #include "grit/app_resources.h"
13 #include "grit/chromium_strings.h" 13 #include "grit/chromium_strings.h"
14 #include "grit/generated_resources.h" 14 #include "grit/generated_resources.h"
15 #include "grit/theme_resources.h" 15 #include "grit/theme_resources_standard.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 #include "ui/gfx/canvas.h" 18 #include "ui/gfx/canvas.h"
19 #include "ui/gfx/font.h" 19 #include "ui/gfx/font.h"
20 #include "ui/gfx/path.h" 20 #include "ui/gfx/path.h"
21 #include "views/controls/button/image_button.h" 21 #include "views/controls/button/image_button.h"
22 #include "views/window/window.h" 22 #include "views/window/window.h"
23 #include "views/window/window_resources.h" 23 #include "views/window/window_resources.h"
24 24
25 #if defined(OS_LINUX) 25 #if defined(OS_LINUX)
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 } 503 }
504 504
505 gfx::Rect AppPanelBrowserFrameView::CalculateClientAreaBounds(int width, 505 gfx::Rect AppPanelBrowserFrameView::CalculateClientAreaBounds(int width,
506 int height) const { 506 int height) const {
507 int top_height = NonClientTopBorderHeight(); 507 int top_height = NonClientTopBorderHeight();
508 int border_thickness = NonClientBorderThickness(); 508 int border_thickness = NonClientBorderThickness();
509 return gfx::Rect(border_thickness, top_height, 509 return gfx::Rect(border_thickness, top_height,
510 std::max(0, width - (2 * border_thickness)), 510 std::max(0, width - (2 * border_thickness)),
511 std::max(0, height - top_height - border_thickness)); 511 std::max(0, height - top_height - border_thickness));
512 } 512 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/first_run_bubble.cc ('k') | chrome/browser/ui/views/infobars/infobar_button_border.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698