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

Side by Side Diff: chrome_frame/ready_mode/ready_mode.cc

Issue 6314016: Update the Ready Mode UI in response to feedback from UI leads, Chrome Frame ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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_frame/ready_mode/ready_mode.h" 5 #include "chrome_frame/ready_mode/ready_mode.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <shlguid.h> 8 #include <shlguid.h>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 installer::ActivePackageProperties package_properties; 195 installer::ActivePackageProperties package_properties;
196 196
197 // Owned by infobar_content 197 // Owned by infobar_content
198 scoped_ptr<ReadyModeState> ready_mode_state(new RegistryReadyModeState( 198 scoped_ptr<ReadyModeState> ready_mode_state(new RegistryReadyModeState(
199 package_properties.GetStateKey(), 199 package_properties.GetStateKey(),
200 base::TimeDelta::FromMinutes(kTemporaryDeclineDurationMinutes), 200 base::TimeDelta::FromMinutes(kTemporaryDeclineDurationMinutes),
201 ready_mode_state_observer.release())); 201 ready_mode_state_observer.release()));
202 202
203 // Owned by infobar_manager 203 // Owned by infobar_manager
204 scoped_ptr<InfobarContent> infobar_content( 204 scoped_ptr<InfobarContent> infobar_content(
205 new ReadyPromptContent(ready_mode_state.release())); 205 new ReadyPromptContent(ready_mode_state.release(), web_browser_));
206 206
207 infobar_manager->Show(infobar_content.release(), TOP_INFOBAR); 207 infobar_manager->Show(infobar_content.release(), TOP_INFOBAR);
208 } 208 }
209 } 209 }
210 210
211 void BrowserObserver::Hide() { 211 void BrowserObserver::Hide() {
212 InfobarManager* infobar_manager = GetInfobarManager(); 212 InfobarManager* infobar_manager = GetInfobarManager();
213 if (infobar_manager) 213 if (infobar_manager)
214 infobar_manager->HideAll(); 214 infobar_manager->HideAll();
215 } 215 }
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 } 353 }
354 } 354 }
355 355
356 // Depending on the state we finally end up in, tell our Delegate to disable 356 // Depending on the state we finally end up in, tell our Delegate to disable
357 // Chrome Frame functionality. 357 // Chrome Frame functionality.
358 if (ShouldDisableChromeFrame(status)) 358 if (ShouldDisableChromeFrame(status))
359 delegate->DisableChromeFrame(); 359 delegate->DisableChromeFrame();
360 } 360 }
361 361
362 } // namespace ready_mode 362 } // namespace ready_mode
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698