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

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

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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 "chrome/browser/lifetime/application_lifetime.h" 10 #include "chrome/browser/lifetime/application_lifetime.h"
(...skipping 23 matching lines...) Expand all
34 34
35 // DesktopThemeProvider maps resource ids using MapThemeImage(). This is 35 // DesktopThemeProvider maps resource ids using MapThemeImage(). This is
36 // necessary for BrowserDesktopWindowTreeHostWin so that it uses the windows 36 // necessary for BrowserDesktopWindowTreeHostWin so that it uses the windows
37 // theme images rather than the ash theme images. 37 // theme images rather than the ash theme images.
38 class DesktopThemeProvider : public ui::ThemeProvider { 38 class DesktopThemeProvider : public ui::ThemeProvider {
39 public: 39 public:
40 explicit DesktopThemeProvider(ui::ThemeProvider* delegate) 40 explicit DesktopThemeProvider(ui::ThemeProvider* delegate)
41 : delegate_(delegate) { 41 : delegate_(delegate) {
42 } 42 }
43 43
44 virtual bool UsingSystemTheme() const override { 44 bool UsingSystemTheme() const override {
45 return delegate_->UsingSystemTheme(); 45 return delegate_->UsingSystemTheme();
46 } 46 }
47 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const override { 47 gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
48 return delegate_->GetImageSkiaNamed( 48 return delegate_->GetImageSkiaNamed(
49 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); 49 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
50 } 50 }
51 virtual SkColor GetColor(int id) const override { 51 SkColor GetColor(int id) const override {
52 return delegate_->GetColor(id); 52 return delegate_->GetColor(id);
53 } 53 }
54 virtual int GetDisplayProperty(int id) const override { 54 int GetDisplayProperty(int id) const override {
55 return delegate_->GetDisplayProperty(id); 55 return delegate_->GetDisplayProperty(id);
56 } 56 }
57 virtual bool ShouldUseNativeFrame() const override { 57 bool ShouldUseNativeFrame() const override {
58 return delegate_->ShouldUseNativeFrame(); 58 return delegate_->ShouldUseNativeFrame();
59 } 59 }
60 virtual bool HasCustomImage(int id) const override { 60 bool HasCustomImage(int id) const override {
61 return delegate_->HasCustomImage( 61 return delegate_->HasCustomImage(
62 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id)); 62 chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
63 } 63 }
64 virtual base::RefCountedMemory* GetRawData( 64 base::RefCountedMemory* GetRawData(
65 int id, 65 int id,
66 ui::ScaleFactor scale_factor) const override { 66 ui::ScaleFactor scale_factor) const override {
67 return delegate_->GetRawData(id, scale_factor); 67 return delegate_->GetRawData(id, scale_factor);
68 } 68 }
69 69
70 private: 70 private:
71 ui::ThemeProvider* delegate_; 71 ui::ThemeProvider* delegate_;
72 72
73 DISALLOW_COPY_AND_ASSIGN(DesktopThemeProvider); 73 DISALLOW_COPY_AND_ASSIGN(DesktopThemeProvider);
74 }; 74 };
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( 355 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost(
356 views::internal::NativeWidgetDelegate* native_widget_delegate, 356 views::internal::NativeWidgetDelegate* native_widget_delegate,
357 views::DesktopNativeWidgetAura* desktop_native_widget_aura, 357 views::DesktopNativeWidgetAura* desktop_native_widget_aura,
358 BrowserView* browser_view, 358 BrowserView* browser_view,
359 BrowserFrame* browser_frame) { 359 BrowserFrame* browser_frame) {
360 return new BrowserDesktopWindowTreeHostWin(native_widget_delegate, 360 return new BrowserDesktopWindowTreeHostWin(native_widget_delegate,
361 desktop_native_widget_aura, 361 desktop_native_widget_aura,
362 browser_view, 362 browser_view,
363 browser_frame); 363 browser_frame);
364 } 364 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698