chrome/browser/ui/ash/system_tray_delegate_chromeos.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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/ash/system_tray_delegate_chromeos.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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/ash/multi_user/multi_user_warning_dialog.cc ('k') | chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

index 6c528d2cd3f1c0729c03910a7a4d7ecad7a7d0a4..18e10d406d12486e0b37b3eaae6fd96a30acb51e 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

@@ -87,6 +87,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

+#include "chrome/grit/generated_resources.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/session_manager_client.h"

#include "chromeos/ime/extension_ime_util.h"

@@ -107,7 +108,6 @@

#include "device/bluetooth/bluetooth_adapter_factory.h"

#include "device/bluetooth/bluetooth_device.h"

#include "grit/ash_strings.h"

-#include "grit/generated_resources.h"

#include "grit/locale_settings.h"

#include "net/base/escape.h"

#include "third_party/cros_system_api/dbus/service_constants.h"