| OLD | NEW |
| 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/libgtk2ui/gtk2_ui.h" | 5 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/environment.h" | 10 #include "base/environment.h" |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 return gfx::Image(); | 520 return gfx::Image(); |
| 521 | 521 |
| 522 SkBitmap bitmap = GdkPixbufToImageSkia(pixbuf.get()); | 522 SkBitmap bitmap = GdkPixbufToImageSkia(pixbuf.get()); |
| 523 DCHECK_EQ(size, bitmap.width()); | 523 DCHECK_EQ(size, bitmap.width()); |
| 524 DCHECK_EQ(size, bitmap.height()); | 524 DCHECK_EQ(size, bitmap.height()); |
| 525 gfx::ImageSkia image_skia = gfx::ImageSkia::CreateFrom1xBitmap(bitmap); | 525 gfx::ImageSkia image_skia = gfx::ImageSkia::CreateFrom1xBitmap(bitmap); |
| 526 image_skia.MakeThreadSafe(); | 526 image_skia.MakeThreadSafe(); |
| 527 return gfx::Image(image_skia); | 527 return gfx::Image(image_skia); |
| 528 } | 528 } |
| 529 | 529 |
| 530 views::Border* Gtk2UI::CreateNativeBorder( | 530 scoped_ptr<views::Border> Gtk2UI::CreateNativeBorder( |
| 531 views::CustomButton* owning_button, | 531 views::CustomButton* owning_button, |
| 532 views::Border* border) { | 532 scoped_ptr<views::Border> border) { |
| 533 return new Gtk2Border(this, owning_button, border); | 533 return scoped_ptr<views::Border>( |
| 534 new Gtk2Border(this, owning_button, border.Pass())); |
| 534 } | 535 } |
| 535 | 536 |
| 536 void Gtk2UI::AddWindowButtonOrderObserver( | 537 void Gtk2UI::AddWindowButtonOrderObserver( |
| 537 views::WindowButtonOrderObserver* observer) { | 538 views::WindowButtonOrderObserver* observer) { |
| 538 if (!leading_buttons_.empty() || !trailing_buttons_.empty()) { | 539 if (!leading_buttons_.empty() || !trailing_buttons_.empty()) { |
| 539 observer->OnWindowButtonOrderingChange(leading_buttons_, | 540 observer->OnWindowButtonOrderingChange(leading_buttons_, |
| 540 trailing_buttons_); | 541 trailing_buttons_); |
| 541 } | 542 } |
| 542 | 543 |
| 543 observer_list_.AddObserver(observer); | 544 observer_list_.AddObserver(observer); |
| (...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1322 | 1323 |
| 1323 void Gtk2UI::ClearAllThemeData() { | 1324 void Gtk2UI::ClearAllThemeData() { |
| 1324 gtk_images_.clear(); | 1325 gtk_images_.clear(); |
| 1325 } | 1326 } |
| 1326 | 1327 |
| 1327 } // namespace libgtk2ui | 1328 } // namespace libgtk2ui |
| 1328 | 1329 |
| 1329 views::LinuxUI* BuildGtk2UI() { | 1330 views::LinuxUI* BuildGtk2UI() { |
| 1330 return new libgtk2ui::Gtk2UI; | 1331 return new libgtk2ui::Gtk2UI; |
| 1331 } | 1332 } |
| OLD | NEW |