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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/status_bubble_views.h" 5 #include "chrome/browser/ui/views/status_bubble_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/resource_bundle.h"
10 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
11 #include "base/message_loop.h" 10 #include "base/message_loop.h"
12 #include "base/string_util.h" 11 #include "base/string_util.h"
13 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/themes/browser_theme_provider.h" 13 #include "chrome/browser/themes/browser_theme_provider.h"
15 #include "gfx/canvas_skia.h" 14 #include "gfx/canvas_skia.h"
16 #include "gfx/point.h" 15 #include "gfx/point.h"
17 #include "googleurl/src/gurl.h" 16 #include "googleurl/src/gurl.h"
18 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
19 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
20 #include "net/base/net_util.h" 19 #include "net/base/net_util.h"
21 #include "third_party/skia/include/core/SkPaint.h" 20 #include "third_party/skia/include/core/SkPaint.h"
22 #include "third_party/skia/include/core/SkPath.h" 21 #include "third_party/skia/include/core/SkPath.h"
23 #include "third_party/skia/include/core/SkRect.h" 22 #include "third_party/skia/include/core/SkRect.h"
24 #include "ui/base/animation/animation_delegate.h" 23 #include "ui/base/animation/animation_delegate.h"
25 #include "ui/base/animation/linear_animation.h" 24 #include "ui/base/animation/linear_animation.h"
25 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/base/text/text_elider.h" 26 #include "ui/base/text/text_elider.h"
27 #include "views/controls/label.h" 27 #include "views/controls/label.h"
28 #include "views/controls/scrollbar/native_scroll_bar.h" 28 #include "views/controls/scrollbar/native_scroll_bar.h"
29 #include "views/screen.h" 29 #include "views/screen.h"
30 #include "views/widget/root_view.h" 30 #include "views/widget/root_view.h"
31 #include "views/widget/widget.h" 31 #include "views/widget/widget.h"
32 #include "views/window/window.h" 32 #include "views/window/window.h"
33 33
34 using views::Widget; 34 using views::Widget;
35 35
(...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 void StatusBubbleViews::SetBubbleWidth(int width) { 828 void StatusBubbleViews::SetBubbleWidth(int width) {
829 size_.set_width(width); 829 size_.set_width(width);
830 SetBounds(original_position_.x(), original_position_.y(), 830 SetBounds(original_position_.x(), original_position_.y(),
831 size_.width(), size_.height()); 831 size_.width(), size_.height());
832 } 832 }
833 833
834 void StatusBubbleViews::CancelExpandTimer() { 834 void StatusBubbleViews::CancelExpandTimer() {
835 if (!expand_timer_factory_.empty()) 835 if (!expand_timer_factory_.empty())
836 expand_timer_factory_.RevokeAll(); 836 expand_timer_factory_.RevokeAll();
837 } 837 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/sad_tab_view.cc ('k') | chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698