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

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

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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
« no previous file with comments | « ui/views/bubble/bubble_border.cc ('k') | ui/views/button_drag_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8
9 #include "grit/ui_resources.h"
10 #include "ui/base/hit_test.h" 9 #include "ui/base/hit_test.h"
11 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
12 #include "ui/gfx/path.h" 11 #include "ui/gfx/path.h"
13 #include "ui/gfx/screen.h" 12 #include "ui/gfx/screen.h"
14 #include "ui/gfx/skia_util.h" 13 #include "ui/gfx/skia_util.h"
15 #include "ui/native_theme/native_theme.h" 14 #include "ui/native_theme/native_theme.h"
15 #include "ui/resources/grit/ui_resources.h"
16 #include "ui/views/bubble/bubble_border.h" 16 #include "ui/views/bubble/bubble_border.h"
17 #include "ui/views/controls/button/label_button.h" 17 #include "ui/views/controls/button/label_button.h"
18 #include "ui/views/widget/widget.h" 18 #include "ui/views/widget/widget.h"
19 #include "ui/views/widget/widget_delegate.h" 19 #include "ui/views/widget/widget_delegate.h"
20 #include "ui/views/window/client_view.h" 20 #include "ui/views/window/client_view.h"
21 21
22 namespace { 22 namespace {
23 23
24 // Insets for the title bar views in pixels. 24 // Insets for the title bar views in pixels.
25 const int kTitleTopInset = 12; 25 const int kTitleTopInset = 12;
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 if (titlebar_extra_view_ != NULL) 361 if (titlebar_extra_view_ != NULL)
362 title_bar_width += titlebar_extra_view_->GetPreferredSize().width(); 362 title_bar_width += titlebar_extra_view_->GetPreferredSize().width();
363 gfx::Size size(client_size); 363 gfx::Size size(client_size);
364 size.SetToMax(gfx::Size(title_bar_width, 0)); 364 size.SetToMax(gfx::Size(title_bar_width, 0));
365 const gfx::Insets insets(GetInsets()); 365 const gfx::Insets insets(GetInsets());
366 size.Enlarge(insets.width(), insets.height()); 366 size.Enlarge(insets.width(), insets.height());
367 return size; 367 return size;
368 } 368 }
369 369
370 } // namespace views 370 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/bubble/bubble_border.cc ('k') | ui/views/button_drag_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698