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

Side by Side Diff: chrome/browser/dom_ui/new_tab_ui.cc

Issue 3127017: Revert 56423 - Added classes to enable session sync functionality.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 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
« no previous file with comments | « chrome/browser/dom_ui/foreign_session_handler.cc ('k') | chrome/browser/dom_ui/value_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include "chrome/browser/dom_ui/new_tab_ui.h" 7 #include "chrome/browser/dom_ui/new_tab_ui.h"
8 8
9 #include <set> 9 #include <set>
10 10
11 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/histogram.h" 14 #include "base/histogram.h"
15 #include "base/i18n/rtl.h" 15 #include "base/i18n/rtl.h"
16 #include "base/singleton.h" 16 #include "base/singleton.h"
17 #include "base/string_number_conversions.h" 17 #include "base/string_number_conversions.h"
18 #include "base/thread.h" 18 #include "base/thread.h"
19 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
20 #include "chrome/browser/browser.h" 20 #include "chrome/browser/browser.h"
21 #include "chrome/browser/chrome_thread.h" 21 #include "chrome/browser/chrome_thread.h"
22 #include "chrome/browser/dom_ui/app_launcher_handler.h" 22 #include "chrome/browser/dom_ui/app_launcher_handler.h"
23 #include "chrome/browser/dom_ui/dom_ui_theme_source.h" 23 #include "chrome/browser/dom_ui/dom_ui_theme_source.h"
24 #include "chrome/browser/dom_ui/foreign_session_handler.h"
25 #include "chrome/browser/dom_ui/most_visited_handler.h" 24 #include "chrome/browser/dom_ui/most_visited_handler.h"
26 #include "chrome/browser/dom_ui/new_tab_page_sync_handler.h" 25 #include "chrome/browser/dom_ui/new_tab_page_sync_handler.h"
27 #include "chrome/browser/dom_ui/ntp_resource_cache.h" 26 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
28 #include "chrome/browser/dom_ui/shown_sections_handler.h" 27 #include "chrome/browser/dom_ui/shown_sections_handler.h"
29 #include "chrome/browser/metrics/user_metrics.h" 28 #include "chrome/browser/metrics/user_metrics.h"
30 #include "chrome/browser/pref_service.h" 29 #include "chrome/browser/pref_service.h"
31 #include "chrome/browser/profile.h" 30 #include "chrome/browser/profile.h"
32 #include "chrome/browser/renderer_host/render_view_host.h" 31 #include "chrome/browser/renderer_host/render_view_host.h"
33 #include "chrome/browser/sessions/session_types.h" 32 #include "chrome/browser/sessions/session_types.h"
34 #include "chrome/browser/sessions/tab_restore_service.h" 33 #include "chrome/browser/sessions/tab_restore_service.h"
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 NewTabHTMLSource::set_first_run(false); 458 NewTabHTMLSource::set_first_run(false);
460 459
461 static bool first_view = true; 460 static bool first_view = true;
462 if (first_view) { 461 if (first_view) {
463 first_view = false; 462 first_view = false;
464 } 463 }
465 464
466 if (!GetProfile()->IsOffTheRecord()) { 465 if (!GetProfile()->IsOffTheRecord()) {
467 PrefService* pref_service = GetProfile()->GetPrefs(); 466 PrefService* pref_service = GetProfile()->GetPrefs();
468 AddMessageHandler((new ShownSectionsHandler(pref_service))->Attach(this)); 467 AddMessageHandler((new ShownSectionsHandler(pref_service))->Attach(this));
469 AddMessageHandler((new browser_sync::ForeignSessionHandler())->
470 Attach(this));
471 AddMessageHandler((new MostVisitedHandler())->Attach(this)); 468 AddMessageHandler((new MostVisitedHandler())->Attach(this));
472 AddMessageHandler((new RecentlyClosedTabsHandler())->Attach(this)); 469 AddMessageHandler((new RecentlyClosedTabsHandler())->Attach(this));
473 AddMessageHandler((new MetricsHandler())->Attach(this)); 470 AddMessageHandler((new MetricsHandler())->Attach(this));
474 if (GetProfile()->IsSyncAccessible()) 471 if (GetProfile()->IsSyncAccessible())
475 AddMessageHandler((new NewTabPageSyncHandler())->Attach(this)); 472 AddMessageHandler((new NewTabPageSyncHandler())->Attach(this));
476 if (Extension::AppsAreEnabled()) { 473 if (Extension::AppsAreEnabled()) {
477 ExtensionsService* service = GetProfile()->GetExtensionsService(); 474 ExtensionsService* service = GetProfile()->GetExtensionsService();
478 // We might not have an ExtensionsService (on ChromeOS when not logged in 475 // We might not have an ExtensionsService (on ChromeOS when not logged in
479 // for example). 476 // for example).
480 if (service) 477 if (service)
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 651
655 scoped_refptr<RefCountedBytes> html_bytes = 652 scoped_refptr<RefCountedBytes> html_bytes =
656 profile_->GetNTPResourceCache()->GetNewTabHTML(is_off_the_record); 653 profile_->GetNTPResourceCache()->GetNewTabHTML(is_off_the_record);
657 654
658 SendResponse(request_id, html_bytes); 655 SendResponse(request_id, html_bytes);
659 } 656 }
660 657
661 std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string&) const { 658 std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string&) const {
662 return "text/html"; 659 return "text/html";
663 } 660 }
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/foreign_session_handler.cc ('k') | chrome/browser/dom_ui/value_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698