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

Unified Diff: base/nix/mime_util_xdg.cc

Issue 8538008: Linux: Move base/mime_util* to base/nix. It's not used on any other platform. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/nix/mime_util_xdg.h ('k') | chrome/browser/icon_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/nix/mime_util_xdg.cc
===================================================================
--- base/nix/mime_util_xdg.cc (revision 109608)
+++ base/nix/mime_util_xdg.cc (working copy)
@@ -2,9 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/mime_util.h"
+#include "base/nix/mime_util_xdg.h"
-
#include <cstdlib>
#include <list>
#include <map>
@@ -16,7 +15,6 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
-#include "base/message_loop.h"
#include "base/nix/xdg_util.h"
#include "base/string_split.h"
#include "base/string_util.h"
@@ -26,7 +24,9 @@
#include "base/time.h"
#if defined(TOOLKIT_USES_GTK)
-#include <gtk/gtk.h>
+#include <gtk/gtk.h> // NOLINT
+
+#include "base/message_loop.h"
#endif
namespace {
@@ -585,7 +585,8 @@
} // namespace
-namespace mime_util {
+namespace base {
+namespace nix {
std::string GetFileMimeType(const FilePath& filepath) {
base::ThreadRestrictions::AssertIOAllowed();
@@ -672,4 +673,5 @@
return FilePath();
}
-} // namespace mime_util
+} // namespace nix
+} // namespace base
« no previous file with comments | « base/nix/mime_util_xdg.h ('k') | chrome/browser/icon_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698