| Index: chrome/browser/ui/libgtkui/gtk2_ui.cc
|
| diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtkui/gtk2_ui.cc
|
| similarity index 97%
|
| rename from chrome/browser/ui/libgtk2ui/gtk2_ui.cc
|
| rename to chrome/browser/ui/libgtkui/gtk2_ui.cc
|
| index 23e63371bcb732a49b6032a57e99c7d32c50ce36..34b8a150248a177b045b19785b0cf3f6439fa27a 100644
|
| --- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
|
| +++ b/chrome/browser/ui/libgtkui/gtk2_ui.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/gtk2_ui.h"
|
| +#include "chrome/browser/ui/libgtkui/gtk2_ui.h"
|
|
|
| #include <math.h>
|
| #include <pango/pango.h>
|
| @@ -22,18 +22,18 @@
|
| #include "base/strings/string_split.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "chrome/browser/themes/theme_properties.h"
|
| -#include "chrome/browser/ui/libgtk2ui/app_indicator_icon.h"
|
| -#include "chrome/browser/ui/libgtk2ui/gtk2_event_loop.h"
|
| -#include "chrome/browser/ui/libgtk2ui/gtk2_key_bindings_handler.h"
|
| -#include "chrome/browser/ui/libgtk2ui/gtk2_status_icon.h"
|
| -#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
|
| -#include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
|
| -#include "chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h"
|
| -#include "chrome/browser/ui/libgtk2ui/printing_gtk2_util.h"
|
| -#include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h"
|
| -#include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
|
| -#include "chrome/browser/ui/libgtk2ui/unity_service.h"
|
| -#include "chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h"
|
| +#include "chrome/browser/ui/libgtkui/app_indicator_icon.h"
|
| +#include "chrome/browser/ui/libgtkui/gtk2_event_loop.h"
|
| +#include "chrome/browser/ui/libgtkui/gtk2_key_bindings_handler.h"
|
| +#include "chrome/browser/ui/libgtkui/gtk2_status_icon.h"
|
| +#include "chrome/browser/ui/libgtkui/gtk2_util.h"
|
| +#include "chrome/browser/ui/libgtkui/native_theme_gtk2.h"
|
| +#include "chrome/browser/ui/libgtkui/print_dialog_gtk2.h"
|
| +#include "chrome/browser/ui/libgtkui/printing_gtk2_util.h"
|
| +#include "chrome/browser/ui/libgtkui/select_file_dialog_impl.h"
|
| +#include "chrome/browser/ui/libgtkui/skia_utils_gtk2.h"
|
| +#include "chrome/browser/ui/libgtkui/unity_service.h"
|
| +#include "chrome/browser/ui/libgtkui/x11_input_method_context_impl_gtk2.h"
|
| #include "chrome/grit/theme_resources.h"
|
| #include "components/grit/components_scaled_resources.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| @@ -62,7 +62,7 @@
|
| #include "printing/printing_context_linux.h"
|
| #endif
|
| #if defined(USE_GCONF)
|
| -#include "chrome/browser/ui/libgtk2ui/gconf_listener.h"
|
| +#include "chrome/browser/ui/libgtkui/gconf_listener.h"
|
| #endif
|
|
|
| // A minimized port of GtkThemeService into something that can provide colors
|
| @@ -80,7 +80,7 @@
|
| #define __need_NULL
|
| #include <stddef.h>
|
|
|
| -namespace libgtk2ui {
|
| +namespace libgtkui {
|
|
|
| namespace {
|
|
|
| @@ -1084,8 +1084,8 @@ float Gtk2UI::GetDeviceScaleFactor() const {
|
| return scale < 1.3f ? 1.0f : roundf(scale * 10) / 10;
|
| }
|
|
|
| -} // namespace libgtk2ui
|
| +} // namespace libgtkui
|
|
|
| views::LinuxUI* BuildGtk2UI() {
|
| - return new libgtk2ui::Gtk2UI;
|
| + return new libgtkui::Gtk2UI;
|
| }
|
|
|