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

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

Issue 10796033: Move files related to registry-controlled domains into a new net/base/registry_controlled_domains/ … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Update checkout 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) 2011 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_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"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/linked_ptr.h" 12 #include "base/memory/linked_ptr.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/win/scoped_bstr.h" 15 #include "base/win/scoped_bstr.h"
16 #include "base/win/scoped_comptr.h" 16 #include "base/win/scoped_comptr.h"
17 #include "base/win/win_util.h" 17 #include "base/win/win_util.h"
18 #include "chrome/installer/util/browser_distribution.h" 18 #include "chrome/installer/util/browser_distribution.h"
19 #include "net/base/registry_controlled_domain.h" 19 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
20 #include "chrome_frame/infobars/infobar_manager.h" 20 #include "chrome_frame/infobars/infobar_manager.h"
21 #include "chrome_frame/ready_mode/internal/ready_mode_web_browser_adapter.h" 21 #include "chrome_frame/ready_mode/internal/ready_mode_web_browser_adapter.h"
22 #include "chrome_frame/ready_mode/internal/ready_prompt_content.h" 22 #include "chrome_frame/ready_mode/internal/ready_prompt_content.h"
23 #include "chrome_frame/ready_mode/internal/registry_ready_mode_state.h" 23 #include "chrome_frame/ready_mode/internal/registry_ready_mode_state.h"
24 #include "chrome_frame/ready_mode/internal/url_launcher.h" 24 #include "chrome_frame/ready_mode/internal/url_launcher.h"
25 #include "chrome_frame/utils.h" 25 #include "chrome_frame/utils.h"
26 26
27 namespace { 27 namespace {
28 28
29 // Temporarily disable Ready Mode for 36 hours when the user so indicates. 29 // Temporarily disable Ready Mode for 36 hours when the user so indicates.
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 } 389 }
390 } 390 }
391 391
392 // Depending on the state we finally end up in, tell our Delegate to disable 392 // Depending on the state we finally end up in, tell our Delegate to disable
393 // Chrome Frame functionality. 393 // Chrome Frame functionality.
394 if (ShouldDisableChromeFrame(status)) 394 if (ShouldDisableChromeFrame(status))
395 delegate->DisableChromeFrame(); 395 delegate->DisableChromeFrame();
396 } 396 }
397 397
398 } // namespace ready_mode 398 } // namespace ready_mode
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698