Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 of 2)

BUG=401588
Committed: https://crrev.com/884a1607171d4655bf01accb112d90fdb5b6a93a
Cr-Commit-Position: refs/heads/master@{#292067}

[Lei Zhang, 2014-08-22 20:13:51]

stamp please?

[tommycli, 2014-08-22 20:35:30]

lgtm sans below:

also: what tool did you use to auto-move the include order?

https://codereview.chromium.org/498773003/diff/40001/chrome/browser/ui/androi...
File
chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc
(left):

https://codereview.chromium.org/498773003/diff/40001/chrome/browser/ui/androi...
chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc:16:
#include "grit/theme_resources.h"
It's expected that these other grit includes don't get the fully qualified name?

https://codereview.chromium.org/498773003/diff/40001/chrome/browser/ui/views/...
File chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
(right):

https://codereview.chromium.org/498773003/diff/40001/chrome/browser/ui/views/...
chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc:515:
Browser* browser,
indent

[Lei Zhang, 2014-08-22 20:52:21]

tools/git/for-all-touched-files.py + tools/sort-headers.py

https://codereview.chromium.org/498773003/diff/40001/chrome/browser/ui/androi...
File
chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc
(left):

https://codereview.chromium.org/498773003/diff/40001/chrome/browser/ui/androi...
chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc:16:
#include "grit/theme_resources.h"
On 2014/08/22 20:35:30, tommycli wrote:
> It's expected that these other grit includes don't get the fully qualified
name?

We're doing them one file at a time.

https://codereview.chromium.org/498773003/diff/40001/chrome/browser/ui/views/...
File chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
(right):

https://codereview.chromium.org/498773003/diff/40001/chrome/browser/ui/views/...
chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc:515:
Browser* browser,
On 2014/08/22 20:35:30, tommycli wrote:
> indent

Done.

[Lei Zhang, 2014-08-26 07:40:41]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-08-26 07:42:36]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/498773003/100001

[commit-bot: I haz the power, 2014-08-26 08:36:26]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-26 08:36:29]

Failed to apply patch for
chrome/browser/ui/views/location_bar/add_to_app_launcher_view.cc:
While running git apply --index -p1;
  error: chrome/browser/ui/views/location_bar/add_to_app_launcher_view.cc: does
not exist in index

Patch:       chrome/browser/ui/views/location_bar/add_to_app_launcher_view.cc
Index: chrome/browser/ui/views/location_bar/add_to_app_launcher_view.cc
diff --git a/chrome/browser/ui/views/location_bar/add_to_app_launcher_view.cc
b/chrome/browser/ui/views/location_bar/add_to_app_launcher_view.cc
index
2d9753ff2c569cd94d12c6b05b66dc9145f6b26a..3fe03c7ca9ff958c07596ad6a1bdcaa0564eac27
100644
--- a/chrome/browser/ui/views/location_bar/add_to_app_launcher_view.cc
+++ b/chrome/browser/ui/views/location_bar/add_to_app_launcher_view.cc
@@ -8,8 +8,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_contents.h"
-#include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"

[Lei Zhang, 2014-08-26 21:30:14]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-08-26 21:31:50]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/498773003/120001

[commit-bot: I haz the power, 2014-08-26 22:55:52]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  mac_chromium_rel_swarming on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)
  win_chromium_x64_rel_swarming on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)

[commit-bot: I haz the power, 2014-08-26 23:53:35]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-26 23:53:39]

Try jobs failed on following builders:
  win_chromium_x64_rel_swarming on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)

[Lei Zhang, 2014-08-27 00:01:35]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-08-27 00:02:10]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/498773003/120001

[commit-bot: I haz the power, 2014-08-27 01:11:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-27 01:11:22]

Failed to commit the patch.

[Lei Zhang, 2014-08-27 01:25:01]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-08-27 01:26:30]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/498773003/120001

[commit-bot: I haz the power, 2014-08-27 01:30:15]

Committed patchset #7 (120001) as 12cdcd1d3ec011f51d8d6a4272523ef16dcec7ca

[commit-bot: I haz the power, 2014-09-10 02:48:44]

Patchset 7 (id:??) landed as
https://crrev.com/884a1607171d4655bf01accb112d90fdb5b6a93a
Cr-Commit-Position: refs/heads/master@{#292067}