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

Side by Side Diff: chrome/browser/chromeos/offline/offline_load_page.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/offline/offline_load_page.h" 5 #include "chrome/browser/chromeos/offline/offline_load_page.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h"
9 #include "base/i18n/rtl.h" 8 #include "base/i18n/rtl.h"
10 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
11 #include "base/string_piece.h" 10 #include "base/string_piece.h"
12 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
13 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
14 #include "base/values.h" 13 #include "base/values.h"
15 #include "chrome/browser/browser_list.h" 14 #include "chrome/browser/browser_list.h"
16 #include "chrome/browser/browser_thread.h" 15 #include "chrome/browser/browser_thread.h"
17 #include "chrome/browser/extensions/extension_service.h" 16 #include "chrome/browser/extensions/extension_service.h"
18 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/tab_contents/navigation_controller.h" 18 #include "chrome/browser/tab_contents/navigation_controller.h"
20 #include "chrome/browser/tab_contents/navigation_entry.h" 19 #include "chrome/browser/tab_contents/navigation_entry.h"
21 #include "chrome/browser/tab_contents/tab_contents.h" 20 #include "chrome/browser/tab_contents/tab_contents.h"
22 #include "chrome/browser/tab_contents/tab_util.h" 21 #include "chrome/browser/tab_contents/tab_util.h"
23 #include "chrome/browser/ui/browser.h" 22 #include "chrome/browser/ui/browser.h"
24 #include "chrome/common/extensions/extension.h" 23 #include "chrome/common/extensions/extension.h"
25 #include "chrome/common/jstemplate_builder.h" 24 #include "chrome/common/jstemplate_builder.h"
26 #include "chrome/common/notification_service.h" 25 #include "chrome/common/notification_service.h"
27 #include "chrome/common/notification_type.h" 26 #include "chrome/common/notification_type.h"
28 #include "chrome/common/url_constants.h" 27 #include "chrome/common/url_constants.h"
29 #include "grit/browser_resources.h" 28 #include "grit/browser_resources.h"
30 #include "grit/generated_resources.h" 29 #include "grit/generated_resources.h"
30 #include "ui/base/resource/resource_bundle.h"
31 31
32 namespace { 32 namespace {
33 33
34 // Maximum time to show a blank page. 34 // Maximum time to show a blank page.
35 const int kMaxBlankPeriod = 3000; 35 const int kMaxBlankPeriod = 3000;
36 36
37 // This is a workaround for crosbug.com/8285. 37 // This is a workaround for crosbug.com/8285.
38 // Chrome sometimes fails to load the page silently 38 // Chrome sometimes fails to load the page silently
39 // when the load is requested right after network is 39 // when the load is requested right after network is
40 // restored. This happens more often in HTTPS than HTTP. 40 // restored. This happens more often in HTTPS than HTTP.
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 registrar_.Remove(this, NotificationType::NETWORK_STATE_CHANGED, 221 registrar_.Remove(this, NotificationType::NETWORK_STATE_CHANGED,
222 NotificationService::AllSources()); 222 NotificationService::AllSources());
223 Proceed(); 223 Proceed();
224 } 224 }
225 } else { 225 } else {
226 InterstitialPage::Observe(type, source, details); 226 InterstitialPage::Observe(type, source, details);
227 } 227 }
228 } 228 }
229 229
230 } // namespace chromeos 230 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/notifications/notification_panel.cc ('k') | chrome/browser/chromeos/options/internet_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698