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

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

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Rebase to ToT Created 6 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/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 "chrome/browser/lifetime/application_lifetime.h" 9 #include "chrome/browser/lifetime/application_lifetime.h"
10 #include "chrome/browser/themes/theme_service.h" 10 #include "chrome/browser/themes/theme_service.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 } 51 }
52 virtual int GetDisplayProperty(int id) const OVERRIDE { 52 virtual int GetDisplayProperty(int id) const OVERRIDE {
53 return delegate_->GetDisplayProperty(id); 53 return delegate_->GetDisplayProperty(id);
54 } 54 }
55 virtual bool ShouldUseNativeFrame() const OVERRIDE { 55 virtual bool ShouldUseNativeFrame() const OVERRIDE {
56 return delegate_->ShouldUseNativeFrame(); 56 return delegate_->ShouldUseNativeFrame();
57 } 57 }
58 virtual bool HasCustomImage(int id) const OVERRIDE { 58 virtual bool HasCustomImage(int id) const OVERRIDE {
59 return delegate_->HasCustomImage( 59 return delegate_->HasCustomImage(
60 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); 60 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
61
62 } 61 }
63 virtual base::RefCountedMemory* GetRawData( 62 virtual base::RefCountedMemory* GetRawData(
64 int id, 63 int id,
65 ui::ScaleFactor scale_factor) const OVERRIDE { 64 ui::ScaleFactor scale_factor) const OVERRIDE {
66 return delegate_->GetRawData(id, scale_factor); 65 return delegate_->GetRawData(id, scale_factor);
67 } 66 }
68 67
69 private: 68 private:
70 ui::ThemeProvider* delegate_; 69 ui::ThemeProvider* delegate_;
71 70
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( 328 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost(
330 views::internal::NativeWidgetDelegate* native_widget_delegate, 329 views::internal::NativeWidgetDelegate* native_widget_delegate,
331 views::DesktopNativeWidgetAura* desktop_native_widget_aura, 330 views::DesktopNativeWidgetAura* desktop_native_widget_aura,
332 BrowserView* browser_view, 331 BrowserView* browser_view,
333 BrowserFrame* browser_frame) { 332 BrowserFrame* browser_frame) {
334 return new BrowserDesktopWindowTreeHostWin(native_widget_delegate, 333 return new BrowserDesktopWindowTreeHostWin(native_widget_delegate,
335 desktop_native_widget_aura, 334 desktop_native_widget_aura,
336 browser_view, 335 browser_view,
337 browser_frame); 336 browser_frame);
338 } 337 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698