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

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

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 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
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 24 matching lines...) Expand all
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/wm/window_state.h" // nogncheck 44 #include "ash/wm/window_state.h" // nogncheck
45 #include "ash/wm/window_state_aura.h" // nogncheck
46 #endif 45 #endif
47 46
48 #if defined(USE_AURA) 47 #if defined(USE_AURA)
49 #include "services/ui/public/cpp/property_type_converters.h" // nogncheck 48 #include "services/ui/public/cpp/property_type_converters.h" // nogncheck
50 #include "services/ui/public/interfaces/window_manager.mojom.h" // nogncheck 49 #include "services/ui/public/interfaces/window_manager.mojom.h" // nogncheck
51 #endif 50 #endif
52 51
53 // The alpha and color of the bubble's shadow. 52 // The alpha and color of the bubble's shadow.
54 static const SkColor kShadowColor = SkColorSetARGB(30, 0, 0, 0); 53 static const SkColor kShadowColor = SkColorSetARGB(30, 0, 0, 0);
55 54
(...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 void StatusBubbleViews::SetBubbleWidth(int width) { 949 void StatusBubbleViews::SetBubbleWidth(int width) {
951 size_.set_width(width); 950 size_.set_width(width);
952 SetBounds(original_position_.x(), original_position_.y(), 951 SetBounds(original_position_.x(), original_position_.y(),
953 size_.width(), size_.height()); 952 size_.width(), size_.height());
954 } 953 }
955 954
956 void StatusBubbleViews::CancelExpandTimer() { 955 void StatusBubbleViews::CancelExpandTimer() {
957 if (expand_timer_factory_.HasWeakPtrs()) 956 if (expand_timer_factory_.HasWeakPtrs())
958 expand_timer_factory_.InvalidateWeakPtrs(); 957 expand_timer_factory_.InvalidateWeakPtrs();
959 } 958 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698