chrome/browser/instant/instant_loader.cc - Issue 5606002: Move:...

Side by Side Diff: chrome/browser/instant/instant_loader.cc

Issue 5606002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years 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/instant/instant_controller.cc ('k') | chrome/browser/instant/promo_counter.cc » ('j') | no next file with comments »

OLD	NEW
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/instant/instant_loader.h"	5 #include "chrome/browser/instant/instant_loader.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <utility>	8 #include <utility>

9	9

10 #include "app/l10n_util.h"	10 #include "app/l10n_util.h"

11 #include "base/command_line.h"	11 #include "base/command_line.h"

12 #include "base/string_number_conversions.h"	12 #include "base/string_number_conversions.h"

13 #include "base/timer.h"	13 #include "base/timer.h"

14 #include "base/utf_string_conversions.h"	14 #include "base/utf_string_conversions.h"

15 #include "base/values.h"	15 #include "base/values.h"

16 #include "chrome/browser/favicon_service.h"	16 #include "chrome/browser/favicon_service.h"

17 #include "chrome/browser/history/history_marshaling.h"	17 #include "chrome/browser/history/history_marshaling.h"

18 #include "chrome/browser/instant/instant_loader_delegate.h"	18 #include "chrome/browser/instant/instant_loader_delegate.h"

19 #include "chrome/browser/profile.h"	19 #include "chrome/browser/profiles/profile.h"

20 #include "chrome/browser/renderer_host/render_view_host.h"	20 #include "chrome/browser/renderer_host/render_view_host.h"

21 #include "chrome/browser/renderer_host/render_widget_host.h"	21 #include "chrome/browser/renderer_host/render_widget_host.h"

22 #include "chrome/browser/renderer_host/render_widget_host_view.h"	22 #include "chrome/browser/renderer_host/render_widget_host_view.h"

23 #include "chrome/browser/search_engines/template_url.h"	23 #include "chrome/browser/search_engines/template_url.h"

24 #include "chrome/browser/tab_contents/navigation_controller.h"	24 #include "chrome/browser/tab_contents/navigation_controller.h"

25 #include "chrome/browser/tab_contents/navigation_entry.h"	25 #include "chrome/browser/tab_contents/navigation_entry.h"

26 #include "chrome/browser/tab_contents/tab_contents.h"	26 #include "chrome/browser/tab_contents/tab_contents.h"

27 #include "chrome/browser/tab_contents/tab_contents_delegate.h"	27 #include "chrome/browser/tab_contents/tab_contents_delegate.h"

28 #include "chrome/browser/tab_contents/tab_contents_view.h"	28 #include "chrome/browser/tab_contents/tab_contents_view.h"

29 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	29 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

(...skipping 741 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
771 SetTakesFocusOnlyOnMouseDown(true);	771 SetTakesFocusOnlyOnMouseDown(true);

772 }	772 }

773 registrar_.Add(	773 registrar_.Add(

774 this,	774 this,

775 NotificationType::RENDER_VIEW_HOST_CHANGED,	775 NotificationType::RENDER_VIEW_HOST_CHANGED,

776 Source<NavigationController>(&preview_contents_->controller()));	776 Source<NavigationController>(&preview_contents_->controller()));

777 #endif	777 #endif

778	778

779 preview_contents_->tab_contents()->ShowContents();	779 preview_contents_->tab_contents()->ShowContents();

780 }	780 }

OLD	NEW