chrome/browser/gtk/gtk_theme_provider.cc - Issue 1606007: Move EnvironmentVariableGetter from base/linux_util.h to base/env_var.h. Labe...

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/gtk/gtk_theme_provider.cc

Issue 1606007: Move EnvironmentVariableGetter from base/linux_util.h to base/env_var.h. Labe... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix windows build for good this time? Created 10 years, 9 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/gtk/create_application_shortcuts_dialog_gtk.cc ('k') | chrome/browser/gtk/options/advanced_contents_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/gtk/gtk_theme_provider.cc

===================================================================

--- chrome/browser/gtk/gtk_theme_provider.cc (revision 43506)

+++ chrome/browser/gtk/gtk_theme_provider.cc (working copy)

@@ -6,7 +6,10 @@

#include <gtk/gtk.h>

+#include <set>

#include "app/resource_bundle.h"

+#include "base/env_var.h"

#include "base/linux_util.h"

#include "base/stl_util-inl.h"

#include "chrome/browser/metrics/user_metrics.h"

@@ -400,13 +403,11 @@

static GdkPixbuf* default_bookmark_icon_ = rb.GetPixbufNamed(

IDR_DEFAULT_FAVICON);

return default_bookmark_icon_;

}

// static

bool GtkThemeProvider::DefaultUsesSystemTheme() {

- scoped_ptr<base::EnvironmentVariableGetter> env_getter(

- base::EnvironmentVariableGetter::Create());

+ scoped_ptr<base::EnvVarGetter> env_getter(base::EnvVarGetter::Create());

switch (base::GetDesktopEnvironment(env_getter.get())) {

case base::DESKTOP_ENVIRONMENT_GNOME: