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

Side by Side Diff: chrome/browser/ui/webui/ntp/new_tab_ui.cc

Issue 12077030: Allow signin to continue even if sync is disabled by policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows sync integration test failure Created 7 years, 10 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) 2012 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 7 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
8 8
9 #include <set> 9 #include <set>
10 10
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 if (!GetProfile()->IsOffTheRecord()) { 109 if (!GetProfile()->IsOffTheRecord()) {
110 web_ui->AddMessageHandler(new browser_sync::ForeignSessionHandler()); 110 web_ui->AddMessageHandler(new browser_sync::ForeignSessionHandler());
111 web_ui->AddMessageHandler(new MostVisitedHandler()); 111 web_ui->AddMessageHandler(new MostVisitedHandler());
112 web_ui->AddMessageHandler(new RecentlyClosedTabsHandler()); 112 web_ui->AddMessageHandler(new RecentlyClosedTabsHandler());
113 web_ui->AddMessageHandler(new MetricsHandler()); 113 web_ui->AddMessageHandler(new MetricsHandler());
114 #if !defined(OS_ANDROID) 114 #if !defined(OS_ANDROID)
115 web_ui->AddMessageHandler(new NewTabPageHandler()); 115 web_ui->AddMessageHandler(new NewTabPageHandler());
116 if (NewTabUI::IsDiscoveryInNTPEnabled()) 116 if (NewTabUI::IsDiscoveryInNTPEnabled())
117 web_ui->AddMessageHandler(new SuggestionsHandler()); 117 web_ui->AddMessageHandler(new SuggestionsHandler());
118 // Android doesn't have a sync promo/username on NTP. 118 // Android doesn't have a sync promo/username on NTP.
119 if (GetProfile()->IsSyncAccessible()) 119 web_ui->AddMessageHandler(new NewTabPageSyncHandler());
120 web_ui->AddMessageHandler(new NewTabPageSyncHandler());
121 120
122 // Or apps. 121 // Or apps.
123 if (ShouldShowApps()) { 122 if (ShouldShowApps()) {
124 ExtensionService* service = GetProfile()->GetExtensionService(); 123 ExtensionService* service = GetProfile()->GetExtensionService();
125 // We might not have an ExtensionService (on ChromeOS when not logged in 124 // We might not have an ExtensionService (on ChromeOS when not logged in
126 // for example). 125 // for example).
127 if (service) 126 if (service)
128 web_ui->AddMessageHandler(new AppLauncherHandler(service)); 127 web_ui->AddMessageHandler(new AppLauncherHandler(service));
129 } 128 }
130 #endif 129 #endif
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 void NewTabUI::NewTabHTMLSource::AddResource(const char* resource, 427 void NewTabUI::NewTabHTMLSource::AddResource(const char* resource,
429 const char* mime_type, 428 const char* mime_type,
430 int resource_id) { 429 int resource_id) {
431 DCHECK(resource); 430 DCHECK(resource);
432 DCHECK(mime_type); 431 DCHECK(mime_type);
433 resource_map_[std::string(resource)] = 432 resource_map_[std::string(resource)] =
434 std::make_pair(std::string(mime_type), resource_id); 433 std::make_pair(std::string(mime_type), resource_id);
435 } 434 }
436 435
437 NewTabUI::NewTabHTMLSource::~NewTabHTMLSource() {} 436 NewTabUI::NewTabHTMLSource::~NewTabHTMLSource() {}
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc ('k') | chrome/browser/ui/webui/ntp/ntp_login_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698