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

Side by Side Diff: chrome/browser/sync/sessions2/sessions_util.cc

Issue 149643010: Cleanup: Move kChromeUIScheme constant into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/sync/sessions2/sessions_util.h" 5 #include "chrome/browser/sync/sessions2/sessions_util.h"
6 6
7 #include "chrome/browser/sync/glue/synced_tab_delegate.h" 7 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
8 #include "chrome/browser/sync/glue/synced_window_delegate.h" 8 #include "chrome/browser/sync/glue/synced_window_delegate.h"
9 #include "chrome/common/url_constants.h" 9 #include "chrome/common/url_constants.h"
10 #include "content/public/browser/navigation_entry.h" 10 #include "content/public/browser/navigation_entry.h"
(...skipping 19 matching lines...) Expand all
30 30
31 int pending_index = tab.GetPendingEntryIndex(); 31 int pending_index = tab.GetPendingEntryIndex();
32 bool found_valid_url = false; 32 bool found_valid_url = false;
33 for (int i = 0; i < entry_count; ++i) { 33 for (int i = 0; i < entry_count; ++i) {
34 const content::NavigationEntry* entry = (i == pending_index) ? 34 const content::NavigationEntry* entry = (i == pending_index) ?
35 tab.GetPendingEntry() : tab.GetEntryAtIndex(i); 35 tab.GetPendingEntry() : tab.GetEntryAtIndex(i);
36 if (!entry) 36 if (!entry)
37 return false; 37 return false;
38 const GURL& virtual_url = entry->GetVirtualURL(); 38 const GURL& virtual_url = entry->GetVirtualURL();
39 if (virtual_url.is_valid() && 39 if (virtual_url.is_valid() &&
40 !virtual_url.SchemeIs(chrome::kChromeUIScheme) && 40 !virtual_url.SchemeIs(content::kChromeUIScheme) &&
41 !virtual_url.SchemeIs(chrome::kChromeNativeScheme) && 41 !virtual_url.SchemeIs(chrome::kChromeNativeScheme) &&
42 !virtual_url.SchemeIsFile()) { 42 !virtual_url.SchemeIsFile()) {
43 found_valid_url = true; 43 found_valid_url = true;
44 } 44 }
45 } 45 }
46 return found_valid_url; 46 return found_valid_url;
47 } 47 }
48 48
49 bool ShouldSyncWindow(const SyncedWindowDelegate* window) { 49 bool ShouldSyncWindow(const SyncedWindowDelegate* window) {
50 if (window->IsApp()) 50 if (window->IsApp())
51 return false; 51 return false;
52 return window->IsTypeTabbed() || window->IsTypePopup(); 52 return window->IsTypeTabbed() || window->IsTypePopup();
53 } 53 }
54 54
55 } // namespace sessions_util 55 } // namespace sessions_util
56 56
57 } // namespace browser_sync 57 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/synced_session.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698