chrome/browser/ui/views/extensions/extension_install_dialog_view.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/views/extensions/extension_install_dialog_view.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/views/extensions/bundle_installed_bubble.cc ('k') | chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

index a35e11dbab6bab3dbba3ff59ddfa41c5e54aa2e7..674b3ae0842679d6de9e3d726ba6d85bc8a4d5f0 100644

--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

@@ -22,11 +22,11 @@

#include "chrome/browser/ui/views/constrained_window_views.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/extension_constants.h"

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

#include "chrome/installer/util/browser_distribution.h"

#include "content/public/browser/page_navigator.h"

#include "content/public/browser/web_contents.h"

#include "extensions/common/extension.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"

@@ -148,12 +148,12 @@ CheckboxedView::CheckboxedView(views::View* view,

views::GridLayout::USE_PREF,

0, // No fixed width.

0);

- column_set->AddColumn(views::GridLayout::LEADING,

- views::GridLayout::LEADING,

- 0,

- views::GridLayout::USE_PREF,

- 0, // No fixed width.

- 0);

+ column_set->AddColumn(views::GridLayout::LEADING,

+ views::GridLayout::LEADING,

+ 0,

+ views::GridLayout::USE_PREF,

+ 0, // No fixed width.

+ 0);

layout->StartRow(0, 0);

views::Checkbox* checkbox = new views::Checkbox(base::string16());

checkbox->set_listener(listener);