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/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/message_loop.h" |
10 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
11 #include "base/values.h" | 12 #include "base/values.h" |
12 #include "chrome/common/child_process_logging.h" | 13 #include "chrome/common/child_process_logging.h" |
13 #include "chrome/common/chrome_switches.h" | 14 #include "chrome/common/chrome_switches.h" |
14 #include "chrome/common/extensions/extension.h" | 15 #include "chrome/common/extensions/extension.h" |
15 #include "chrome/common/extensions/extension_constants.h" | 16 #include "chrome/common/extensions/extension_constants.h" |
16 #include "chrome/common/extensions/extension_localization_peer.h" | 17 #include "chrome/common/extensions/extension_localization_peer.h" |
17 #include "chrome/common/extensions/extension_set.h" | 18 #include "chrome/common/extensions/extension_set.h" |
18 #include "chrome/common/jstemplate_builder.h" | 19 #include "chrome/common/jstemplate_builder.h" |
19 #include "chrome/common/render_messages.h" | 20 #include "chrome/common/render_messages.h" |
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
588 if (old_url.is_empty() && frame->opener()) | 589 if (old_url.is_empty() && frame->opener()) |
589 old_url = frame->opener()->url(); | 590 old_url = frame->opener()->url(); |
590 | 591 |
591 bool old_url_is_hosted_app = extensions->GetByURL(old_url) && | 592 bool old_url_is_hosted_app = extensions->GetByURL(old_url) && |
592 !extensions->GetByURL(old_url)->web_extent().is_empty(); | 593 !extensions->GetByURL(old_url)->web_extent().is_empty(); |
593 return !extensions->InSameExtent(old_url, new_url) && | 594 return !extensions->InSameExtent(old_url, new_url) && |
594 !old_url_is_hosted_app; | 595 !old_url_is_hosted_app; |
595 } | 596 } |
596 | 597 |
597 } // namespace chrome | 598 } // namespace chrome |
OLD | NEW |