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

Side by Side Diff: chrome/browser/ui/browser_init.cc

Issue 6995124: Revert 86510 - Contributed by junov@chromium.org (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser_init.h" 5 #include "chrome/browser/ui/browser_init.h"
6 6
7 #include <algorithm> // For max(). 7 #include <algorithm> // For max().
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
(...skipping 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 // it is closed. 1038 // it is closed.
1039 tab->AddInfoBar(new SessionCrashedInfoBarDelegate(tab->tab_contents())); 1039 tab->AddInfoBar(new SessionCrashedInfoBarDelegate(tab->tab_contents()));
1040 } 1040 }
1041 } 1041 }
1042 1042
1043 void BrowserInit::LaunchWithProfile::AddBadFlagsInfoBarIfNecessary( 1043 void BrowserInit::LaunchWithProfile::AddBadFlagsInfoBarIfNecessary(
1044 TabContentsWrapper* tab) { 1044 TabContentsWrapper* tab) {
1045 // Unsupported flags for which to display a warning that "stability and 1045 // Unsupported flags for which to display a warning that "stability and
1046 // security will suffer". 1046 // security will suffer".
1047 static const char* kBadFlags[] = { 1047 static const char* kBadFlags[] = {
1048 // Warn when accelerated 2d canvas is enabled as its presence can
1049 // affect stability and rendering correctness of certain pages.
1050 // TODO(vangelis): Remove when accelerated 2d canvas is enabled by default.
1051 switches::kEnableAccelerated2dCanvas,
Justin Novosad 2011/06/10 15:02:18 This part should be excluded from the revert.
1048 // These imply disabling the sandbox. 1052 // These imply disabling the sandbox.
1049 switches::kSingleProcess, 1053 switches::kSingleProcess,
1050 switches::kNoSandbox, 1054 switches::kNoSandbox,
1051 switches::kInProcessWebGL, 1055 switches::kInProcessWebGL,
1052 NULL 1056 NULL
1053 }; 1057 };
1054 1058
1055 const char* bad_flag = NULL; 1059 const char* bad_flag = NULL;
1056 for (const char** flag = kBadFlags; *flag; ++flag) { 1060 for (const char** flag = kBadFlags; *flag; ++flag) {
1057 if (command_line_.HasSwitch(*flag)) { 1061 if (command_line_.HasSwitch(*flag)) {
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
1423 return false; 1427 return false;
1424 automation->SetExpectedTabCount(expected_tabs); 1428 automation->SetExpectedTabCount(expected_tabs);
1425 1429
1426 AutomationProviderList* list = 1430 AutomationProviderList* list =
1427 g_browser_process->InitAutomationProviderList(); 1431 g_browser_process->InitAutomationProviderList();
1428 DCHECK(list); 1432 DCHECK(list);
1429 list->AddProvider(automation); 1433 list->AddProvider(automation);
1430 1434
1431 return true; 1435 return true;
1432 } 1436 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/render_view_host_delegate_helper.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698