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

Side by Side Diff: chrome/browser/extensions/extension_install_ui_default.cc

Issue 10702017: Revert r 144574 "Modify experimental identity flow to display scope descriptions and details." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/extensions/extension_install_ui_default.h" 5 #include "chrome/browser/extensions/extension_install_ui_default.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/extensions/extension_install_prompt.h" 9 #include "chrome/browser/extensions/extension_install_prompt.h"
10 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h" 10 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 return false; 80 return false;
81 } 81 }
82 82
83 Browser* browser_; 83 Browser* browser_;
84 CrxInstallerError error_; 84 CrxInstallerError error_;
85 }; 85 };
86 86
87 } // namespace 87 } // namespace
88 88
89 ExtensionInstallUIDefault::ExtensionInstallUIDefault(Browser* browser) 89 ExtensionInstallUIDefault::ExtensionInstallUIDefault(Browser* browser)
90 : skip_post_install_ui_(false), 90 : browser_(browser),
91 skip_post_install_ui_(false),
91 previous_using_native_theme_(false), 92 previous_using_native_theme_(false),
92 use_app_installed_bubble_(false) { 93 use_app_installed_bubble_(false) {
93 browser_ = browser;
94
95 // Remember the current theme in case the user presses undo. 94 // Remember the current theme in case the user presses undo.
96 if (browser) { 95 if (browser) {
97 Profile* profile = browser->profile(); 96 Profile* profile = browser->profile();
98 const Extension* previous_theme = 97 const Extension* previous_theme =
99 ThemeServiceFactory::GetThemeForProfile(profile); 98 ThemeServiceFactory::GetThemeForProfile(profile);
100 if (previous_theme) 99 if (previous_theme)
101 previous_theme_id_ = previous_theme->id(); 100 previous_theme_id_ = previous_theme->id();
102 previous_using_native_theme_ = 101 previous_using_native_theme_ =
103 ThemeServiceFactory::GetForProfile(profile)->UsingNativeTheme(); 102 ThemeServiceFactory::GetForProfile(profile)->UsingNativeTheme();
104 } 103 }
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 #else 251 #else
253 NOTREACHED(); 252 NOTREACHED();
254 #endif 253 #endif
255 } 254 }
256 } 255 }
257 256
258 // static 257 // static
259 void ExtensionInstallUI::DisableFailureUIForTests() { 258 void ExtensionInstallUI::DisableFailureUIForTests() {
260 disable_failure_ui_for_tests = true; 259 disable_failure_ui_for_tests = true;
261 } 260 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_install_ui_default.h ('k') | chrome/browser/extensions/extension_navigation_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698