Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1085)

Side by Side Diff: chrome/browser/ui/startup/obsolete_system_infobar_delegate.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, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/startup/obsolete_system_infobar_delegate.h" 5 #include "chrome/browser/ui/startup/obsolete_system_infobar_delegate.h"
6 6
7 #include "base/cpu.h" 7 #include "base/cpu.h"
8 #include "chrome/browser/infobars/infobar_service.h" 8 #include "chrome/browser/infobars/infobar_service.h"
9 #include "chrome/common/url_constants.h" 9 #include "chrome/common/url_constants.h"
10 #include "chrome/grit/chromium_strings.h"
11 #include "chrome/grit/generated_resources.h"
10 #include "components/infobars/core/infobar.h" 12 #include "components/infobars/core/infobar.h"
11 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
12 #include "grit/chromium_strings.h"
13 #include "grit/generated_resources.h"
14 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
15 15
16 #if defined(OS_MACOSX) 16 #if defined(OS_MACOSX)
17 #include "chrome/browser/mac/obsolete_system.h" 17 #include "chrome/browser/mac/obsolete_system.h"
18 #endif 18 #endif
19 19
20 // static 20 // static
21 void ObsoleteSystemInfoBarDelegate::Create(InfoBarService* infobar_service) { 21 void ObsoleteSystemInfoBarDelegate::Create(InfoBarService* infobar_service) {
22 #if defined(OS_MACOSX) 22 #if defined(OS_MACOSX)
23 if (!ObsoleteSystemMac::Is32BitObsoleteNowOrSoon() || 23 if (!ObsoleteSystemMac::Is32BitObsoleteNowOrSoon() ||
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 GURL(chrome::kMac32BitDeprecationURL), 70 GURL(chrome::kMac32BitDeprecationURL),
71 #else 71 #else
72 GURL("http://www.google.com/support/chrome/bin/" 72 GURL("http://www.google.com/support/chrome/bin/"
73 "answer.py?answer=95411"), 73 "answer.py?answer=95411"),
74 #endif 74 #endif
75 content::Referrer(), 75 content::Referrer(),
76 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, 76 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
77 content::PAGE_TRANSITION_LINK, false)); 77 content::PAGE_TRANSITION_LINK, false));
78 return false; 78 return false;
79 } 79 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698