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

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

Issue 12378016: chrome: Update include paths of string_split.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
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/about_ui.h" 5 #include "chrome/browser/ui/webui/about_ui.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>
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #endif 74 #endif
75 75
76 #if defined(OS_CHROMEOS) 76 #if defined(OS_CHROMEOS)
77 #include "chrome/browser/chromeos/customization_document.h" 77 #include "chrome/browser/chromeos/customization_document.h"
78 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" 78 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
79 #include "chrome/browser/ui/webui/chromeos/about_network.h" 79 #include "chrome/browser/ui/webui/chromeos/about_network.h"
80 #endif 80 #endif
81 81
82 #if defined(USE_ASH) 82 #if defined(USE_ASH)
83 #include "ash/wm/frame_painter.h" 83 #include "ash/wm/frame_painter.h"
84 #include "base/string_split.h" 84 #include "base/strings/string_split.h"
85 #endif 85 #endif
86 86
87 using base::Time; 87 using base::Time;
88 using base::TimeDelta; 88 using base::TimeDelta;
89 using content::BrowserThread; 89 using content::BrowserThread;
90 using content::WebContents; 90 using content::WebContents;
91 91
92 namespace { 92 namespace {
93 93
94 const char kCreditsJsPath[] = "credits.js"; 94 const char kCreditsJsPath[] = "credits.js";
(...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 Profile* profile = Profile::FromWebUI(web_ui); 1058 Profile* profile = Profile::FromWebUI(web_ui);
1059 1059
1060 #if defined(ENABLE_THEMES) 1060 #if defined(ENABLE_THEMES)
1061 // Set up the chrome://theme/ source. 1061 // Set up the chrome://theme/ source.
1062 ThemeSource* theme = new ThemeSource(profile); 1062 ThemeSource* theme = new ThemeSource(profile);
1063 content::URLDataSource::Add(profile, theme); 1063 content::URLDataSource::Add(profile, theme);
1064 #endif 1064 #endif
1065 1065
1066 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile)); 1066 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile));
1067 } 1067 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/tabs/tab_strip_model_unittest.cc ('k') | chrome/browser/ui/webui/cookies_tree_model_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698