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

Side by Side Diff: ui/views/bubble/bubble_frame_view.cc

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
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 "ui/views/bubble/bubble_frame_view.h" 5 #include "ui/views/bubble/bubble_frame_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "build/build_config.h"
10 #include "ui/base/hit_test.h" 11 #include "ui/base/hit_test.h"
11 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
12 #include "ui/base/resource/resource_bundle.h" 13 #include "ui/base/resource/resource_bundle.h"
13 #include "ui/gfx/path.h" 14 #include "ui/gfx/path.h"
14 #include "ui/gfx/screen.h" 15 #include "ui/gfx/screen.h"
15 #include "ui/gfx/skia_util.h" 16 #include "ui/gfx/skia_util.h"
16 #include "ui/native_theme/native_theme.h" 17 #include "ui/native_theme/native_theme.h"
17 #include "ui/resources/grit/ui_resources.h" 18 #include "ui/resources/grit/ui_resources.h"
18 #include "ui/strings/grit/ui_strings.h" 19 #include "ui/strings/grit/ui_strings.h"
19 #include "ui/views/bubble/bubble_border.h" 20 #include "ui/views/bubble/bubble_border.h"
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 if (titlebar_extra_view_ != NULL) 467 if (titlebar_extra_view_ != NULL)
467 title_bar_width += titlebar_extra_view_->GetPreferredSize().width(); 468 title_bar_width += titlebar_extra_view_->GetPreferredSize().width();
468 gfx::Size size(client_size); 469 gfx::Size size(client_size);
469 size.SetToMax(gfx::Size(title_bar_width, 0)); 470 size.SetToMax(gfx::Size(title_bar_width, 0));
470 const gfx::Insets insets(GetInsets()); 471 const gfx::Insets insets(GetInsets());
471 size.Enlarge(insets.width(), insets.height()); 472 size.Enlarge(insets.width(), insets.height());
472 return size; 473 return size;
473 } 474 }
474 475
475 } // namespace views 476 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698