OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/chromeos/login/signin/merge_session_load_page.h" | 5 #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h" |
6 | 6 |
7 #include "base/metrics/histogram_macros.h" | 7 #include "base/metrics/histogram_macros.h" |
8 #include "base/strings/string_piece.h" | 8 #include "base/strings/string_piece.h" |
9 #include "base/strings/stringprintf.h" | |
10 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
11 #include "base/values.h" | 10 #include "base/values.h" |
12 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
13 #include "chrome/browser/chrome_notification_types.h" | 12 #include "chrome/browser/chrome_notification_types.h" |
14 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" | 13 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" |
15 #include "chrome/browser/extensions/extension_service.h" | 14 #include "chrome/browser/extensions/extension_service.h" |
16 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/renderer_preferences_util.h" | 16 #include "chrome/browser/renderer_preferences_util.h" |
18 #include "chrome/browser/tab_contents/tab_util.h" | 17 #include "chrome/browser/tab_contents/tab_util.h" |
19 #include "chrome/common/extensions/extension_constants.h" | 18 #include "chrome/common/extensions/extension_constants.h" |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 " NOT " : "") | 162 " NOT " : "") |
164 << " be blocking now, " | 163 << " be blocking now, " |
165 << state; | 164 << state; |
166 if (!manager->ShouldBlockTabLoading()) { | 165 if (!manager->ShouldBlockTabLoading()) { |
167 manager->RemoveObserver(this); | 166 manager->RemoveObserver(this); |
168 interstitial_page_->Proceed(); | 167 interstitial_page_->Proceed(); |
169 } | 168 } |
170 } | 169 } |
171 | 170 |
172 } // namespace chromeos | 171 } // namespace chromeos |
OLD | NEW |