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

Side by Side Diff: chrome/browser/chromeos/frame/bubble_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/chromeos/frame/bubble_frame_view.h" 5 #include "chrome/browser/chromeos/frame/bubble_frame_view.h"
6 6
7 #include "chrome/browser/chromeos/frame/bubble_window.h" 7 #include "chrome/browser/chromeos/frame/bubble_window.h"
8 #include "chrome/browser/chromeos/login/helper.h" 8 #include "chrome/browser/chromeos/login/helper.h"
9 #include "chrome/browser/ui/views/bubble/bubble_border.h" 9 #include "chrome/browser/ui/views/bubble/bubble_border.h"
10 #include "grit/theme_resources.h" 10 #include "grit/theme_resources_standard.h"
11 #include "ui/base/resource/resource_bundle.h" 11 #include "ui/base/resource/resource_bundle.h"
12 #include "ui/gfx/canvas_skia.h" 12 #include "ui/gfx/canvas_skia.h"
13 #include "ui/gfx/font.h" 13 #include "ui/gfx/font.h"
14 #include "ui/gfx/insets.h" 14 #include "ui/gfx/insets.h"
15 #include "ui/gfx/path.h" 15 #include "ui/gfx/path.h"
16 #include "ui/gfx/rect.h" 16 #include "ui/gfx/rect.h"
17 #include "views/controls/button/image_button.h" 17 #include "views/controls/button/image_button.h"
18 #include "views/controls/label.h" 18 #include "views/controls/label.h"
19 #include "views/controls/throbber.h" 19 #include "views/controls/throbber.h"
20 #include "views/window/hit_test.h" 20 #include "views/window/hit_test.h"
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 OnPaintBorder(canvas); 225 OnPaintBorder(canvas);
226 } 226 }
227 227
228 void BubbleFrameView::ButtonPressed(views::Button* sender, 228 void BubbleFrameView::ButtonPressed(views::Button* sender,
229 const views::Event& event) { 229 const views::Event& event) {
230 if (close_button_ != NULL && sender == close_button_) 230 if (close_button_ != NULL && sender == close_button_)
231 frame_->CloseWindow(); 231 frame_->CloseWindow();
232 } 232 }
233 233
234 } // namespace chromeos 234 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/autofill/autofill_cc_infobar_delegate.cc ('k') | chrome/browser/chromeos/login/message_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698