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

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

Issue 6672070: Move the remaining files in chrome\common to content\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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/instant/instant_loader.h ('k') | chrome/browser/load_notification_details.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) 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/instant/instant_loader.h" 5 #include "chrome/browser/instant/instant_loader.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
14 #include "base/timer.h" 14 #include "base/timer.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "chrome/browser/favicon_service.h" 17 #include "chrome/browser/favicon_service.h"
18 #include "chrome/browser/history/history_marshaling.h" 18 #include "chrome/browser/history/history_marshaling.h"
19 #include "chrome/browser/instant/instant_loader_delegate.h" 19 #include "chrome/browser/instant/instant_loader_delegate.h"
20 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/search_engines/template_url.h" 21 #include "chrome/browser/search_engines/template_url.h"
22 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 22 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
23 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/page_transition_types.h"
25 #include "chrome/common/render_messages.h" 24 #include "chrome/common/render_messages.h"
26 #include "chrome/common/renderer_preferences.h" 25 #include "chrome/common/renderer_preferences.h"
27 #include "content/browser/renderer_host/render_view_host.h" 26 #include "content/browser/renderer_host/render_view_host.h"
28 #include "content/browser/renderer_host/render_widget_host.h" 27 #include "content/browser/renderer_host/render_widget_host.h"
29 #include "content/browser/renderer_host/render_widget_host_view.h" 28 #include "content/browser/renderer_host/render_widget_host_view.h"
30 #include "content/browser/tab_contents/navigation_controller.h" 29 #include "content/browser/tab_contents/navigation_controller.h"
31 #include "content/browser/tab_contents/navigation_entry.h" 30 #include "content/browser/tab_contents/navigation_entry.h"
32 #include "content/browser/tab_contents/tab_contents.h" 31 #include "content/browser/tab_contents/tab_contents.h"
33 #include "content/browser/tab_contents/tab_contents_delegate.h" 32 #include "content/browser/tab_contents/tab_contents_delegate.h"
34 #include "content/browser/tab_contents/tab_contents_view.h" 33 #include "content/browser/tab_contents/tab_contents_view.h"
35 #include "content/common/notification_details.h" 34 #include "content/common/notification_details.h"
36 #include "content/common/notification_observer.h" 35 #include "content/common/notification_observer.h"
37 #include "content/common/notification_registrar.h" 36 #include "content/common/notification_registrar.h"
38 #include "content/common/notification_service.h" 37 #include "content/common/notification_service.h"
39 #include "content/common/notification_source.h" 38 #include "content/common/notification_source.h"
40 #include "content/common/notification_type.h" 39 #include "content/common/notification_type.h"
40 #include "content/common/page_transition_types.h"
41 #include "net/http/http_util.h" 41 #include "net/http/http_util.h"
42 #include "ui/base/l10n/l10n_util.h" 42 #include "ui/base/l10n/l10n_util.h"
43 #include "ui/gfx/codec/png_codec.h" 43 #include "ui/gfx/codec/png_codec.h"
44 44
45 namespace { 45 namespace {
46 46
47 // Number of ms to delay before updating the omnibox bounds. This is only used 47 // Number of ms to delay before updating the omnibox bounds. This is only used
48 // when the bounds of the omnibox shrinks. If the bounds grows, we update 48 // when the bounds of the omnibox shrinks. If the bounds grows, we update
49 // immediately. 49 // immediately.
50 const int kUpdateBoundsDelayMS = 1000; 50 const int kUpdateBoundsDelayMS = 1000;
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
960 Source<NavigationController>(&preview_contents_->controller())); 960 Source<NavigationController>(&preview_contents_->controller()));
961 #endif 961 #endif
962 962
963 registrar_.Add( 963 registrar_.Add(
964 this, 964 this,
965 NotificationType::NAV_ENTRY_COMMITTED, 965 NotificationType::NAV_ENTRY_COMMITTED,
966 Source<NavigationController>(&preview_contents_->controller())); 966 Source<NavigationController>(&preview_contents_->controller()));
967 967
968 preview_contents_->tab_contents()->ShowContents(); 968 preview_contents_->tab_contents()->ShowContents();
969 } 969 }
OLDNEW
« no previous file with comments | « chrome/browser/instant/instant_loader.h ('k') | chrome/browser/load_notification_details.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698