diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 02:05:11 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 02:05:11 +0000 |
| commit | 9929da90886e2df0c91810766cf09b4b110218c6 (patch) | |
| tree | e94f246a0c6305e7d2f9e594d0c73191fe5ac3b1 /chrome/browser/browser_init.cc | |
| parent | 58956203f3268d5b4642a8ad586fdd66ad7d9375 (diff) | |
| download | chromium_src-9929da90886e2df0c91810766cf09b4b110218c6.zip chromium_src-9929da90886e2df0c91810766cf09b4b110218c6.tar.gz chromium_src-9929da90886e2df0c91810766cf09b4b110218c6.tar.bz2 | |
Adds toplevel app/ directory and moves ResourceBundle into it.
No changes to resource bundle yet, just the move to keep this CL as compact as possible.
Adds new vcproj and gyp file for app dir.
http://crbug.com/11387
Review URL: http://codereview.chromium.org/100354
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 8adb962..00d265d 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -4,6 +4,7 @@ #include "chrome/browser/browser_init.h" +#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/command_line.h" #include "base/event_recorder.h" @@ -37,7 +38,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/result_codes.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -140,8 +140,8 @@ class NotifyNotDefaultBrowserTask : public Task { } TabContents* tab = browser->GetSelectedTabContents(); // Don't show the info-bar if there are already info-bars showing. - // In ChromeBot tests, there might be a race. This line appears to get - // called during shutdown and |tab| can be NULL. + // In ChromeBot tests, there might be a race. This line appears to get + // called during shutdown and |tab| can be NULL. if (!tab || tab->infobar_delegate_count() > 0) return; tab->AddInfoBar(new DefaultBrowserInfoBarDelegate(tab)); |