chrome/browser/ui/webui/slideshow_ui.cc - Issue 6879122: Revert 82509 - Moving slideshow to extension.TEST=noneBUG=chromium-os:11430Review URL: http://cod...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/webui/slideshow_ui.cc

Issue 6879122: Revert 82509 - Moving slideshow to extension.TEST=noneBUG=chromium-os:11430Review URL: http://cod... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 8 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/ui/webui/slideshow_ui.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/ui/webui/slideshow_ui.h"	5 #include "chrome/browser/ui/webui/slideshow_ui.h"

6	6

7 #include "base/callback.h"	7 #include "base/callback.h"

8 #include "base/memory/singleton.h"	8 #include "base/memory/singleton.h"

9 #include "base/memory/weak_ptr.h"	9 #include "base/memory/weak_ptr.h"

10 #include "base/message_loop.h"	10 #include "base/message_loop.h"

(...skipping 264 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
275	275

276 SlideshowUI::SlideshowUI(TabContents* contents) : WebUI(contents) {	276 SlideshowUI::SlideshowUI(TabContents* contents) : WebUI(contents) {

277 SlideshowHandler* handler = new SlideshowHandler();	277 SlideshowHandler* handler = new SlideshowHandler();

278 AddMessageHandler((handler)->Attach(this));	278 AddMessageHandler((handler)->Attach(this));

279 handler->Init();	279 handler->Init();

280 SlideshowUIHTMLSource* html_source = new SlideshowUIHTMLSource();	280 SlideshowUIHTMLSource* html_source = new SlideshowUIHTMLSource();

281	281

282 // Set up the chrome://slideshow/ source.	282 // Set up the chrome://slideshow/ source.

283 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);	283 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);

284 }	284 }

OLD	NEW