chrome/browser/chromeos/status/network_menu.cc - Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos.

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/chromeos/status/network_menu.cc

Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

Index: chrome/browser/chromeos/status/network_menu.cc

diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc

index 80209f929ebf8dd513c9b66858f545f36f382471..29938468c6b91438631e5f0cf034733f07441583 100644

--- a/chrome/browser/chromeos/status/network_menu.cc

+++ b/chrome/browser/chromeos/status/network_menu.cc

@@ -6,8 +6,10 @@

#include <algorithm>

+#include "ash/resources/grit/ash_resources.h"

#include "ash/shell.h"

#include "ash/shell_delegate.h"

+#include "ash/strings/grit/ash_strings.h"

#include "ash/system/chromeos/network/network_connect.h"

#include "base/bind.h"

#include "base/logging.h"

@@ -21,13 +23,11 @@

#include "chrome/browser/defaults.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/common/url_constants.h"

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

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

#include "chromeos/network/device_state.h"

#include "chromeos/network/network_state.h"

#include "chromeos/network/network_state_handler.h"

-#include "grit/ash_resources.h"

-#include "grit/ash_strings.h"

-#include "grit/generated_resources.h"

-#include "grit/ui_chromeos_strings.h"

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

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/models/menu_model.h"