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

Side by Side Diff: content/browser/tab_contents/navigation_controller.cc

Issue 8413051: Move PageZoom enum into content/public/common and into the content namespace. Also move content_c... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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) 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 "content/browser/tab_contents/navigation_controller.h" 5 #include "content/browser/tab_contents/navigation_controller.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/time.h" 10 #include "base/time.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "content/browser/browser_context.h" 12 #include "content/browser/browser_context.h"
13 #include "content/browser/browser_url_handler.h" 13 #include "content/browser/browser_url_handler.h"
14 #include "content/browser/child_process_security_policy.h" 14 #include "content/browser/child_process_security_policy.h"
15 #include "content/browser/in_process_webkit/session_storage_namespace.h" 15 #include "content/browser/in_process_webkit/session_storage_namespace.h"
16 #include "content/browser/site_instance.h" 16 #include "content/browser/site_instance.h"
17 #include "content/browser/tab_contents/interstitial_page.h" 17 #include "content/browser/tab_contents/interstitial_page.h"
18 #include "content/browser/tab_contents/navigation_details.h" 18 #include "content/browser/tab_contents/navigation_details.h"
19 #include "content/browser/tab_contents/navigation_entry.h" 19 #include "content/browser/tab_contents/navigation_entry.h"
20 #include "content/browser/tab_contents/tab_contents.h" 20 #include "content/browser/tab_contents/tab_contents.h"
21 #include "content/browser/tab_contents/tab_contents_delegate.h" 21 #include "content/browser/tab_contents/tab_contents_delegate.h"
22 #include "content/browser/user_metrics.h" 22 #include "content/browser/user_metrics.h"
23 #include "content/common/content_constants.h"
24 #include "content/public/browser/notification_service.h" 23 #include "content/public/browser/notification_service.h"
24 #include "content/public/common/content_constants.h"
25 #include "content/common/view_messages.h" 25 #include "content/common/view_messages.h"
26 #include "content/public/browser/notification_types.h" 26 #include "content/public/browser/notification_types.h"
27 #include "net/base/escape.h" 27 #include "net/base/escape.h"
28 #include "net/base/mime_util.h" 28 #include "net/base/mime_util.h"
29 #include "net/base/net_util.h" 29 #include "net/base/net_util.h"
30 #include "webkit/glue/webkit_glue.h" 30 #include "webkit/glue/webkit_glue.h"
31 31
32 namespace { 32 namespace {
33 33
34 const int kInvalidateAll = 0xFFFFFFFF; 34 const int kInvalidateAll = 0xFFFFFFFF;
(...skipping 1194 matching lines...) Expand 10 before | Expand all | Expand 10 after
1229 for (int i = 0; i < max_index; i++) { 1229 for (int i = 0; i < max_index; i++) {
1230 // When cloning a tab, copy all entries except interstitial pages 1230 // When cloning a tab, copy all entries except interstitial pages
1231 if (source.entries_[i].get()->page_type() != 1231 if (source.entries_[i].get()->page_type() !=
1232 content::PAGE_TYPE_INTERSTITIAL) { 1232 content::PAGE_TYPE_INTERSTITIAL) {
1233 entries_.insert(entries_.begin() + insert_index++, 1233 entries_.insert(entries_.begin() + insert_index++,
1234 linked_ptr<NavigationEntry>( 1234 linked_ptr<NavigationEntry>(
1235 new NavigationEntry(*source.entries_[i]))); 1235 new NavigationEntry(*source.entries_[i])));
1236 } 1236 }
1237 } 1237 }
1238 } 1238 }
OLDNEW
« no previous file with comments | « content/browser/site_instance_unittest.cc ('k') | content/browser/tab_contents/navigation_entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698