Index: chrome/browser/ui/libgtkui/print_dialog_gtk2.cc |
diff --git a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc b/chrome/browser/ui/libgtkui/print_dialog_gtk2.cc |
similarity index 97% |
rename from chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc |
rename to chrome/browser/ui/libgtkui/print_dialog_gtk2.cc |
index 5f7acef9e8fee8bee3d7730a11d4023ae73b16ab..a2f4fe9c81fabc45d46d05b92cc5af4007cca3f1 100644 |
--- a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc |
+++ b/chrome/browser/ui/libgtkui/print_dialog_gtk2.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h" |
+#include "chrome/browser/ui/libgtkui/print_dialog_gtk2.h" |
#include <gtk/gtkunixprint.h> |
@@ -19,8 +19,8 @@ |
#include "base/macros.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/values.h" |
-#include "chrome/browser/ui/libgtk2ui/gtk2_util.h" |
-#include "chrome/browser/ui/libgtk2ui/printing_gtk2_util.h" |
+#include "chrome/browser/ui/libgtkui/gtk2_util.h" |
+#include "chrome/browser/ui/libgtkui/printing_gtk2_util.h" |
#include "printing/metafile.h" |
#include "printing/print_job_constants.h" |
#include "printing/print_settings.h" |
@@ -190,10 +190,10 @@ PrintDialogGtk2::~PrintDialogGtk2() { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
if (dialog_) { |
- aura::Window* parent = libgtk2ui::GetAuraTransientParent(dialog_); |
+ aura::Window* parent = libgtkui::GetAuraTransientParent(dialog_); |
if (parent) { |
parent->RemoveObserver(this); |
- libgtk2ui::ClearAuraTransientParent(dialog_); |
+ libgtkui::ClearAuraTransientParent(dialog_); |
} |
gtk_widget_destroy(dialog_); |
dialog_ = NULL; |
@@ -333,7 +333,7 @@ void PrintDialogGtk2::ShowDialog( |
DCHECK(!callback_.is_null()); |
dialog_ = gtk_print_unix_dialog_new(NULL, NULL); |
- libgtk2ui::SetGtkTransientForAura(dialog_, parent_view); |
+ libgtkui::SetGtkTransientForAura(dialog_, parent_view); |
if (parent_view) |
parent_view->AddObserver(this); |
g_signal_connect(dialog_, "delete-event", |
@@ -554,9 +554,9 @@ void PrintDialogGtk2::InitPrintSettings(PrintSettings* settings) { |
} |
void PrintDialogGtk2::OnWindowDestroying(aura::Window* window) { |
- DCHECK_EQ(libgtk2ui::GetAuraTransientParent(dialog_), window); |
+ DCHECK_EQ(libgtkui::GetAuraTransientParent(dialog_), window); |
- libgtk2ui::ClearAuraTransientParent(dialog_); |
+ libgtkui::ClearAuraTransientParent(dialog_); |
window->RemoveObserver(this); |
if (!callback_.is_null()) { |
callback_.Run(PrintingContextLinux::CANCEL); |