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

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

Issue 1550053002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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_x11.h" 5 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h"
6 6
7 #include <utility>
8
7 #include "base/macros.h" 9 #include "base/macros.h"
8 #include "chrome/browser/themes/theme_service.h" 10 #include "chrome/browser/themes/theme_service.h"
9 #include "chrome/browser/themes/theme_service_factory.h" 11 #include "chrome/browser/themes/theme_service_factory.h"
10 #include "chrome/browser/ui/views/frame/browser_frame.h" 12 #include "chrome/browser/ui/views/frame/browser_frame.h"
11 #include "chrome/browser/ui/views/frame/browser_view.h" 13 #include "chrome/browser/ui/views/frame/browser_view.h"
12 #include "chrome/browser/ui/views/theme_image_mapper.h" 14 #include "chrome/browser/ui/views/theme_image_mapper.h"
13 15
14 namespace { 16 namespace {
15 17
16 // DesktopThemeProvider maps resource ids using MapThemeImage(). This is 18 // DesktopThemeProvider maps resource ids using MapThemeImage(). This is
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 BrowserDesktopWindowTreeHostX11::BrowserDesktopWindowTreeHostX11( 74 BrowserDesktopWindowTreeHostX11::BrowserDesktopWindowTreeHostX11(
73 views::internal::NativeWidgetDelegate* native_widget_delegate, 75 views::internal::NativeWidgetDelegate* native_widget_delegate,
74 views::DesktopNativeWidgetAura* desktop_native_widget_aura, 76 views::DesktopNativeWidgetAura* desktop_native_widget_aura,
75 BrowserView* browser_view, 77 BrowserView* browser_view,
76 BrowserFrame* browser_frame) 78 BrowserFrame* browser_frame)
77 : DesktopWindowTreeHostX11(native_widget_delegate, 79 : DesktopWindowTreeHostX11(native_widget_delegate,
78 desktop_native_widget_aura), 80 desktop_native_widget_aura),
79 browser_view_(browser_view) { 81 browser_view_(browser_view) {
80 scoped_ptr<ui::ThemeProvider> theme_provider( 82 scoped_ptr<ui::ThemeProvider> theme_provider(
81 new DesktopThemeProvider(browser_view->browser()->profile())); 83 new DesktopThemeProvider(browser_view->browser()->profile()));
82 browser_frame->SetThemeProvider(theme_provider.Pass()); 84 browser_frame->SetThemeProvider(std::move(theme_provider));
83 browser_frame->set_frame_type( 85 browser_frame->set_frame_type(
84 browser_frame->UseCustomFrame() ? views::Widget::FRAME_TYPE_FORCE_CUSTOM 86 browser_frame->UseCustomFrame() ? views::Widget::FRAME_TYPE_FORCE_CUSTOM
85 : views::Widget::FRAME_TYPE_FORCE_NATIVE); 87 : views::Widget::FRAME_TYPE_FORCE_NATIVE);
86 } 88 }
87 89
88 BrowserDesktopWindowTreeHostX11::~BrowserDesktopWindowTreeHostX11() { 90 BrowserDesktopWindowTreeHostX11::~BrowserDesktopWindowTreeHostX11() {
89 } 91 }
90 92
91 //////////////////////////////////////////////////////////////////////////////// 93 ////////////////////////////////////////////////////////////////////////////////
92 // BrowserDesktopWindowTreeHostX11, 94 // BrowserDesktopWindowTreeHostX11,
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( 134 BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost(
133 views::internal::NativeWidgetDelegate* native_widget_delegate, 135 views::internal::NativeWidgetDelegate* native_widget_delegate,
134 views::DesktopNativeWidgetAura* desktop_native_widget_aura, 136 views::DesktopNativeWidgetAura* desktop_native_widget_aura,
135 BrowserView* browser_view, 137 BrowserView* browser_view,
136 BrowserFrame* browser_frame) { 138 BrowserFrame* browser_frame) {
137 return new BrowserDesktopWindowTreeHostX11(native_widget_delegate, 139 return new BrowserDesktopWindowTreeHostX11(native_widget_delegate,
138 desktop_native_widget_aura, 140 desktop_native_widget_aura,
139 browser_view, 141 browser_view,
140 browser_frame); 142 browser_frame);
141 } 143 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/external_protocol_dialog.cc ('k') | chrome/browser/ui/views/frame/browser_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698