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

Side by Side Diff: chrome/browser/chrome_browser_main_win.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 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
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/chrome_browser_main_win.h" 5 #include "chrome/browser/chrome_browser_main_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 int GetMinimumFontSize() { 83 int GetMinimumFontSize() {
84 int min_font_size; 84 int min_font_size;
85 base::StringToInt(l10n_util::GetStringUTF16(IDS_MINIMUM_UI_FONT_SIZE), 85 base::StringToInt(l10n_util::GetStringUTF16(IDS_MINIMUM_UI_FONT_SIZE),
86 &min_font_size); 86 &min_font_size);
87 return min_font_size; 87 return min_font_size;
88 } 88 }
89 89
90 class TranslationDelegate : public installer::TranslationDelegate { 90 class TranslationDelegate : public installer::TranslationDelegate {
91 public: 91 public:
92 virtual base::string16 GetLocalizedString(int installer_string_id) OVERRIDE; 92 virtual base::string16 GetLocalizedString(int installer_string_id) override;
93 }; 93 };
94 94
95 bool IsSafeModeStart() { 95 bool IsSafeModeStart() {
96 return ::GetEnvironmentVariableA(chrome::kSafeModeEnvVar, NULL, 0) != 0; 96 return ::GetEnvironmentVariableA(chrome::kSafeModeEnvVar, NULL, 0) != 0;
97 } 97 }
98 98
99 } // namespace 99 } // namespace
100 100
101 void ShowCloseBrowserFirstMessageBox() { 101 void ShowCloseBrowserFirstMessageBox() {
102 int message_id = IDS_UNINSTALL_CLOSE_APP; 102 int message_id = IDS_UNINSTALL_CLOSE_APP;
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 if (resource_id) 428 if (resource_id)
429 return l10n_util::GetStringUTF16(resource_id); 429 return l10n_util::GetStringUTF16(resource_id);
430 return base::string16(); 430 return base::string16();
431 } 431 }
432 432
433 // static 433 // static
434 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { 434 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
435 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); 435 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
436 installer::SetTranslationDelegate(&delegate); 436 installer::SetTranslationDelegate(&delegate);
437 } 437 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_win.h ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698