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

Side by Side Diff: chrome/browser/ui/libgtkui/gtk_ui.cc

Issue 2714053003: Fix GCC build for target 'all' (Closed)
Patch Set: Remove auto Created 3 years, 9 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/libgtkui/gtk_ui.h" 5 #include "chrome/browser/ui/libgtkui/gtk_ui.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <pango/pango.h> 8 #include <pango/pango.h>
9 #include <X11/Xcursor/Xcursor.h> 9 #include <X11/Xcursor/Xcursor.h>
10 10
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after
703 703
704 for (unsigned i = 0; i < arraysize(paintstate); i++) { 704 for (unsigned i = 0; i < arraysize(paintstate); i++) {
705 std::string idr = is_blue ? paintstate[i].idr_blue : paintstate[i].idr; 705 std::string idr = is_blue ? paintstate[i].idr_blue : paintstate[i].idr;
706 gtk_border->SetPainter( 706 gtk_border->SetPainter(
707 paintstate[i].focus, paintstate[i].state, 707 paintstate[i].focus, paintstate[i].state,
708 border->PaintsButtonState(paintstate[i].focus, paintstate[i].state) 708 border->PaintsButtonState(paintstate[i].focus, paintstate[i].state)
709 ? base::MakeUnique<GtkButtonPainter>(idr) 709 ? base::MakeUnique<GtkButtonPainter>(idr)
710 : nullptr); 710 : nullptr);
711 } 711 }
712 712
713 return gtk_border; 713 return std::unique_ptr<views::Border>(gtk_border.release());
Lei Zhang 2017/02/25 00:50:34 std::move again.
Tom (Use chromium acct) 2017/02/25 01:40:21 Done.
714 } 714 }
715 715
716 void GtkUi::AddWindowButtonOrderObserver( 716 void GtkUi::AddWindowButtonOrderObserver(
717 views::WindowButtonOrderObserver* observer) { 717 views::WindowButtonOrderObserver* observer) {
718 if (!leading_buttons_.empty() || !trailing_buttons_.empty()) { 718 if (!leading_buttons_.empty() || !trailing_buttons_.empty()) {
719 observer->OnWindowButtonOrderingChange(leading_buttons_, trailing_buttons_); 719 observer->OnWindowButtonOrderingChange(leading_buttons_, trailing_buttons_);
720 } 720 }
721 721
722 observer_list_.AddObserver(observer); 722 observer_list_.AddObserver(observer);
723 } 723 }
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 1073
1074 float GtkUi::GetDeviceScaleFactor() const { 1074 float GtkUi::GetDeviceScaleFactor() const {
1075 return device_scale_factor_; 1075 return device_scale_factor_;
1076 } 1076 }
1077 1077
1078 } // namespace libgtkui 1078 } // namespace libgtkui
1079 1079
1080 views::LinuxUI* BuildGtkUi() { 1080 views::LinuxUI* BuildGtkUi() {
1081 return new libgtkui::GtkUi; 1081 return new libgtkui::GtkUi;
1082 } 1082 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698