Index: chrome/browser/ui/libgtkui/unity_service.cc |
diff --git a/chrome/browser/ui/libgtk2ui/unity_service.cc b/chrome/browser/ui/libgtkui/unity_service.cc |
similarity index 95% |
rename from chrome/browser/ui/libgtk2ui/unity_service.cc |
rename to chrome/browser/ui/libgtkui/unity_service.cc |
index 7bdf8010dba76a1d8738f203046b132bfea3efd6..eb382e22eb1f226a2b4ecd80cb4513baec289b8c 100644 |
--- a/chrome/browser/ui/libgtk2ui/unity_service.cc |
+++ b/chrome/browser/ui/libgtkui/unity_service.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/unity_service.h" |
+#include "chrome/browser/ui/libgtkui/unity_service.h" |
#include <dlfcn.h> |
#include <gtk/gtk.h> |
@@ -12,8 +12,7 @@ |
#include "base/environment.h" |
#include "base/nix/xdg_util.h" |
-#include "chrome/browser/shell_integration_linux.h" |
-#include "chrome/browser/ui/libgtk2ui/gtk2_util.h" |
+#include "chrome/browser/ui/libgtkui/gtk2_util.h" |
// Unity data typedefs. |
typedef struct _UnityInspector UnityInspector; |
@@ -93,7 +92,7 @@ void EnsureMethodsLoaded() { |
reinterpret_cast<unity_launcher_entry_get_for_desktop_id_func>( |
dlsym(unity_lib, "unity_launcher_entry_get_for_desktop_id")); |
if (entry_get_for_desktop_id) { |
- std::string desktop_id = libgtk2ui::GetDesktopName(env.get()); |
+ std::string desktop_id = libgtkui::GetDesktopName(env.get()); |
chrome_entry = entry_get_for_desktop_id(desktop_id.c_str()); |
entry_set_count = |