chrome/browser/ui/gtk/unity_service.cc - Issue 10097004: Moved Linux specific shell integration declarations into own header.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/unity_service.cc

Issue 10097004: Moved Linux specific shell integration declarations into own header. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc ('k') | chrome/browser/web_applications/web_app_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/unity_service.cc

diff --git a/chrome/browser/ui/gtk/unity_service.cc b/chrome/browser/ui/gtk/unity_service.cc

index 7adc936e3f02d30e56084cc7ff87eb46c771a426..c4e343f6f3fc8dd1feb1328dd8d4493ebdcb290f 100644

--- a/chrome/browser/ui/gtk/unity_service.cc

+++ b/chrome/browser/ui/gtk/unity_service.cc

@@ -9,7 +9,7 @@

#include "base/environment.h"

#include "base/memory/scoped_ptr.h"

-#include "chrome/browser/shell_integration.h"

+#include "chrome/browser/shell_integration_linux.h"

// Unity data typedefs.

typedef struct _UnityInspector UnityInspector;

@@ -77,7 +77,7 @@ void EnsureMethodsLoaded() {

dlsym(unity_lib, "unity_launcher_entry_get_for_desktop_id"));

if (entry_get_for_desktop_id) {

scoped_ptr<base::Environment> env(base::Environment::Create());

- std::string desktop_id = ShellIntegration::GetDesktopName(env.get());

+ std::string desktop_id = ShellIntegrationLinux::GetDesktopName(env.get());

chrome_entry = entry_get_for_desktop_id(desktop_id.c_str());

entry_set_count =