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

Side by Side Diff: ui/views/mus/native_widget_mus.cc

Issue 2483683002: Try to get rid of all direct references to particular native themes. (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « ui/native_theme/native_theme_win.cc ('k') | ui/views/view.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 // This has to be before any other includes, else default is picked up. 5 // This has to be before any other includes, else default is picked up.
6 // See base/logging for details on this. 6 // See base/logging for details on this.
7 #define NOTIMPLEMENTED_POLICY 5 7 #define NOTIMPLEMENTED_POLICY 5
8 8
9 #include "ui/views/mus/native_widget_mus.h" 9 #include "ui/views/mus/native_widget_mus.h"
10 10
(...skipping 20 matching lines...) Expand all
31 #include "ui/aura/layout_manager.h" 31 #include "ui/aura/layout_manager.h"
32 #include "ui/aura/mus/mus_util.h" 32 #include "ui/aura/mus/mus_util.h"
33 #include "ui/aura/window.h" 33 #include "ui/aura/window.h"
34 #include "ui/aura/window_property.h" 34 #include "ui/aura/window_property.h"
35 #include "ui/base/hit_test.h" 35 #include "ui/base/hit_test.h"
36 #include "ui/display/display.h" 36 #include "ui/display/display.h"
37 #include "ui/display/screen.h" 37 #include "ui/display/screen.h"
38 #include "ui/events/event.h" 38 #include "ui/events/event.h"
39 #include "ui/gfx/canvas.h" 39 #include "ui/gfx/canvas.h"
40 #include "ui/gfx/path.h" 40 #include "ui/gfx/path.h"
41 #include "ui/native_theme/native_theme_aura.h" 41 #include "ui/native_theme/native_theme.h"
42 #include "ui/platform_window/platform_window_delegate.h" 42 #include "ui/platform_window/platform_window_delegate.h"
43 #include "ui/views/corewm/tooltip.h" 43 #include "ui/views/corewm/tooltip.h"
44 #include "ui/views/corewm/tooltip_aura.h" 44 #include "ui/views/corewm/tooltip_aura.h"
45 #include "ui/views/corewm/tooltip_controller.h" 45 #include "ui/views/corewm/tooltip_controller.h"
46 #include "ui/views/drag_utils.h" 46 #include "ui/views/drag_utils.h"
47 #include "ui/views/mus/drag_drop_client_mus.h" 47 #include "ui/views/mus/drag_drop_client_mus.h"
48 #include "ui/views/mus/drop_target_mus.h" 48 #include "ui/views/mus/drop_target_mus.h"
49 #include "ui/views/mus/input_method_mus.h" 49 #include "ui/views/mus/input_method_mus.h"
50 #include "ui/views/mus/window_manager_connection.h" 50 #include "ui/views/mus/window_manager_connection.h"
51 #include "ui/views/mus/window_manager_constants_converters.h" 51 #include "ui/views/mus/window_manager_constants_converters.h"
(...skipping 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after
1308 const base::TimeDelta& duration) { 1308 const base::TimeDelta& duration) {
1309 NOTIMPLEMENTED(); 1309 NOTIMPLEMENTED();
1310 } 1310 }
1311 1311
1312 void NativeWidgetMus::SetVisibilityAnimationTransition( 1312 void NativeWidgetMus::SetVisibilityAnimationTransition(
1313 Widget::VisibilityTransition transition) { 1313 Widget::VisibilityTransition transition) {
1314 NOTIMPLEMENTED(); 1314 NOTIMPLEMENTED();
1315 } 1315 }
1316 1316
1317 ui::NativeTheme* NativeWidgetMus::GetNativeTheme() const { 1317 ui::NativeTheme* NativeWidgetMus::GetNativeTheme() const {
1318 return ui::NativeThemeAura::instance(); 1318 return ui::NativeTheme::GetInstanceForNativeUi();
1319 } 1319 }
1320 1320
1321 void NativeWidgetMus::OnRootViewLayout() { 1321 void NativeWidgetMus::OnRootViewLayout() {
1322 NOTIMPLEMENTED(); 1322 NOTIMPLEMENTED();
1323 } 1323 }
1324 1324
1325 bool NativeWidgetMus::IsTranslucentWindowOpacitySupported() const { 1325 bool NativeWidgetMus::IsTranslucentWindowOpacitySupported() const {
1326 NOTIMPLEMENTED(); 1326 NOTIMPLEMENTED();
1327 return true; 1327 return true;
1328 } 1328 }
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
1569 1569
1570 gfx::Path mask_path; 1570 gfx::Path mask_path;
1571 native_widget_delegate_->GetHitTestMask(&mask_path); 1571 native_widget_delegate_->GetHitTestMask(&mask_path);
1572 // TODO(jamescook): Use the full path for the mask. 1572 // TODO(jamescook): Use the full path for the mask.
1573 gfx::Rect mask_rect = 1573 gfx::Rect mask_rect =
1574 gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds())); 1574 gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
1575 window_->SetHitTestMask(mask_rect); 1575 window_->SetHitTestMask(mask_rect);
1576 } 1576 }
1577 1577
1578 } // namespace views 1578 } // namespace views
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme_win.cc ('k') | ui/views/view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698