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

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame.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_frame.h" 5 #include "chrome/browser/ui/views/frame/browser_frame.h"
6 6
7 #include <utility>
8
7 #include "base/debug/leak_annotations.h" 9 #include "base/debug/leak_annotations.h"
8 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
9 #include "build/build_config.h" 11 #include "build/build_config.h"
10 #include "chrome/browser/app_mode/app_mode_utils.h" 12 #include "chrome/browser/app_mode/app_mode_utils.h"
11 #include "chrome/browser/themes/theme_service.h" 13 #include "chrome/browser/themes/theme_service.h"
12 #include "chrome/browser/themes/theme_service_factory.h" 14 #include "chrome/browser/themes/theme_service_factory.h"
13 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_list.h" 16 #include "chrome/browser/ui/browser_list.h"
15 #include "chrome/browser/ui/browser_window_state.h" 17 #include "chrome/browser/ui/browser_window_state.h"
16 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 18 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 DCHECK(non_client_view()); 99 DCHECK(non_client_view());
98 non_client_view()->set_context_menu_controller(this); 100 non_client_view()->set_context_menu_controller(this);
99 } 101 }
100 102
101 #if defined(OS_LINUX) 103 #if defined(OS_LINUX)
102 browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_)); 104 browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_));
103 #endif 105 #endif
104 } 106 }
105 107
106 void BrowserFrame::SetThemeProvider(scoped_ptr<ui::ThemeProvider> provider) { 108 void BrowserFrame::SetThemeProvider(scoped_ptr<ui::ThemeProvider> provider) {
107 owned_theme_provider_ = provider.Pass(); 109 owned_theme_provider_ = std::move(provider);
108 theme_provider_ = owned_theme_provider_.get(); 110 theme_provider_ = owned_theme_provider_.get();
109 } 111 }
110 112
111 int BrowserFrame::GetMinimizeButtonOffset() const { 113 int BrowserFrame::GetMinimizeButtonOffset() const {
112 return native_browser_frame_->GetMinimizeButtonOffset(); 114 return native_browser_frame_->GetMinimizeButtonOffset();
113 } 115 }
114 116
115 gfx::Rect BrowserFrame::GetBoundsForTabStrip(views::View* tabstrip) const { 117 gfx::Rect BrowserFrame::GetBoundsForTabStrip(views::View* tabstrip) const {
116 // This can be invoked before |browser_frame_view_| has been set. 118 // This can be invoked before |browser_frame_view_| has been set.
117 return browser_frame_view_ ? 119 return browser_frame_view_ ?
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 261
260 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { 262 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() {
261 return browser_frame_view_->avatar_button(); 263 return browser_frame_view_->avatar_button();
262 } 264 }
263 265
264 #if defined(FRAME_AVATAR_BUTTON) 266 #if defined(FRAME_AVATAR_BUTTON)
265 NewAvatarButton* BrowserFrame::GetNewAvatarMenuButton() { 267 NewAvatarButton* BrowserFrame::GetNewAvatarMenuButton() {
266 return browser_frame_view_->new_avatar_button(); 268 return browser_frame_view_->new_avatar_button();
267 } 269 }
268 #endif 270 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698