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

Side by Side Diff: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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/frame/browser_desktop_window_tree_host_win.h" 5 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 8
9 #include "base/process/process_handle.h" 9 #include "base/process/process_handle.h"
10 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
(...skipping 29 matching lines...) Expand all
40 public: 40 public:
41 explicit DesktopThemeProvider(ui::ThemeProvider* delegate) 41 explicit DesktopThemeProvider(ui::ThemeProvider* delegate)
42 : delegate_(delegate) { 42 : delegate_(delegate) {
43 } 43 }
44 44
45 bool UsingSystemTheme() const override { 45 bool UsingSystemTheme() const override {
46 return delegate_->UsingSystemTheme(); 46 return delegate_->UsingSystemTheme();
47 } 47 }
48 gfx::ImageSkia* GetImageSkiaNamed(int id) const override { 48 gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
49 return delegate_->GetImageSkiaNamed( 49 return delegate_->GetImageSkiaNamed(
50 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); 50 chrome::MapThemeImage(ui::HOST_DESKTOP_TYPE_NATIVE, id));
51 } 51 }
52 SkColor GetColor(int id) const override { 52 SkColor GetColor(int id) const override {
53 return delegate_->GetColor(id); 53 return delegate_->GetColor(id);
54 } 54 }
55 int GetDisplayProperty(int id) const override { 55 int GetDisplayProperty(int id) const override {
56 return delegate_->GetDisplayProperty(id); 56 return delegate_->GetDisplayProperty(id);
57 } 57 }
58 bool ShouldUseNativeFrame() const override { 58 bool ShouldUseNativeFrame() const override {
59 return delegate_->ShouldUseNativeFrame(); 59 return delegate_->ShouldUseNativeFrame();
60 } 60 }
61 bool HasCustomImage(int id) const override { 61 bool HasCustomImage(int id) const override {
62 return delegate_->HasCustomImage( 62 return delegate_->HasCustomImage(
63 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); 63 chrome::MapThemeImage(ui::HOST_DESKTOP_TYPE_NATIVE, id));
64 } 64 }
65 base::RefCountedMemory* GetRawData( 65 base::RefCountedMemory* GetRawData(
66 int id, 66 int id,
67 ui::ScaleFactor scale_factor) const override { 67 ui::ScaleFactor scale_factor) const override {
68 return delegate_->GetRawData(id, scale_factor); 68 return delegate_->GetRawData(id, scale_factor);
69 } 69 }
70 70
71 private: 71 private:
72 ui::ThemeProvider* delegate_; 72 ui::ThemeProvider* delegate_;
73 73
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( 365 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost(
366 views::internal::NativeWidgetDelegate* native_widget_delegate, 366 views::internal::NativeWidgetDelegate* native_widget_delegate,
367 views::DesktopNativeWidgetAura* desktop_native_widget_aura, 367 views::DesktopNativeWidgetAura* desktop_native_widget_aura,
368 BrowserView* browser_view, 368 BrowserView* browser_view,
369 BrowserFrame* browser_frame) { 369 BrowserFrame* browser_frame) {
370 return new BrowserDesktopWindowTreeHostWin(native_widget_delegate, 370 return new BrowserDesktopWindowTreeHostWin(native_widget_delegate,
371 desktop_native_widget_aura, 371 desktop_native_widget_aura,
372 browser_view, 372 browser_view,
373 browser_frame); 373 browser_frame);
374 } 374 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698