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

Side by Side Diff: chrome/browser/ui/webui/cookies_tree_model_util.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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/ui/webui/conflicts_ui.cc ('k') | chrome/browser/ui/webui/crashes_ui.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/webui/cookies_tree_model_util.h" 5 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/i18n/time_formatting.h" 9 #include "base/i18n/time_formatting.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_split.h" 13 #include "base/strings/string_split.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/browsing_data/cookies_tree_model.h" 16 #include "chrome/browser/browsing_data/cookies_tree_model.h"
17 #include "chrome/grit/generated_resources.h"
17 #include "content/public/browser/indexed_db_context.h" 18 #include "content/public/browser/indexed_db_context.h"
18 #include "content/public/browser/service_worker_context.h" 19 #include "content/public/browser/service_worker_context.h"
19 #include "grit/generated_resources.h"
20 #include "net/cookies/canonical_cookie.h" 20 #include "net/cookies/canonical_cookie.h"
21 #include "net/ssl/ssl_client_cert_type.h" 21 #include "net/ssl/ssl_client_cert_type.h"
22 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/base/text/bytes_formatting.h" 23 #include "ui/base/text/bytes_formatting.h"
24 #include "webkit/common/fileapi/file_system_types.h" 24 #include "webkit/common/fileapi/file_system_types.h"
25 25
26 #if defined(ENABLE_EXTENSIONS) 26 #if defined(ENABLE_EXTENSIONS)
27 #include "extensions/common/extension_set.h" 27 #include "extensions/common/extension_set.h"
28 #endif 28 #endif
29 29
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 child = id_map_.Lookup(node_id); 345 child = id_map_.Lookup(node_id);
346 child_index = parent->GetIndexOf(child); 346 child_index = parent->GetIndexOf(child);
347 if (child_index == -1) 347 if (child_index == -1)
348 break; 348 break;
349 349
350 parent = child; 350 parent = child;
351 } 351 }
352 352
353 return child_index >= 0 ? child : NULL; 353 return child_index >= 0 ? child : NULL;
354 } 354 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/conflicts_ui.cc ('k') | chrome/browser/ui/webui/crashes_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698