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

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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
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 "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 "base/bind.h" 9 #include "base/bind.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 23 matching lines...) Expand all
34 #include "ui/gfx/skia_util.h" 34 #include "ui/gfx/skia_util.h"
35 #include "ui/gfx/text_elider.h" 35 #include "ui/gfx/text_elider.h"
36 #include "ui/gfx/text_utils.h" 36 #include "ui/gfx/text_utils.h"
37 #include "ui/native_theme/native_theme.h" 37 #include "ui/native_theme/native_theme.h"
38 #include "ui/views/controls/scrollbar/scroll_bar_views.h" 38 #include "ui/views/controls/scrollbar/scroll_bar_views.h"
39 #include "ui/views/widget/root_view.h" 39 #include "ui/views/widget/root_view.h"
40 #include "ui/views/widget/widget.h" 40 #include "ui/views/widget/widget.h"
41 #include "url/gurl.h" 41 #include "url/gurl.h"
42 42
43 #if defined(USE_ASH) 43 #if defined(USE_ASH)
44 #include "ash/common/wm/window_state.h" // nogncheck 44 #include "ash/wm/window_state.h" // nogncheck
45 #include "ash/wm/window_state_aura.h" // nogncheck 45 #include "ash/wm/window_state_aura.h" // nogncheck
46 #endif 46 #endif
47 47
48 #if defined(USE_AURA) 48 #if defined(USE_AURA)
49 #include "services/ui/public/cpp/property_type_converters.h" // nogncheck 49 #include "services/ui/public/cpp/property_type_converters.h" // nogncheck
50 #include "services/ui/public/interfaces/window_manager.mojom.h" // nogncheck 50 #include "services/ui/public/interfaces/window_manager.mojom.h" // nogncheck
51 #endif 51 #endif
52 52
53 // The alpha and color of the bubble's shadow. 53 // The alpha and color of the bubble's shadow.
54 static const SkColor kShadowColor = SkColorSetARGB(30, 0, 0, 0); 54 static const SkColor kShadowColor = SkColorSetARGB(30, 0, 0, 0);
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
948 void StatusBubbleViews::SetBubbleWidth(int width) { 948 void StatusBubbleViews::SetBubbleWidth(int width) {
949 size_.set_width(width); 949 size_.set_width(width);
950 SetBounds(original_position_.x(), original_position_.y(), 950 SetBounds(original_position_.x(), original_position_.y(),
951 size_.width(), size_.height()); 951 size_.width(), size_.height());
952 } 952 }
953 953
954 void StatusBubbleViews::CancelExpandTimer() { 954 void StatusBubbleViews::CancelExpandTimer() {
955 if (expand_timer_factory_.HasWeakPtrs()) 955 if (expand_timer_factory_.HasWeakPtrs())
956 expand_timer_factory_.InvalidateWeakPtrs(); 956 expand_timer_factory_.InvalidateWeakPtrs();
957 } 957 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698