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

Unified Diff: content/browser/geolocation/win7_location_api_win.h

Issue 7265009: Revert 90464 - Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/url_request_test.cc ('k') | content/common/gpu/gpu_channel_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/geolocation/win7_location_api_win.h
===================================================================
--- content/browser/geolocation/win7_location_api_win.h (revision 90470)
+++ content/browser/geolocation/win7_location_api_win.h (working copy)
@@ -1,18 +1,18 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CONTENT_BROWSER_GEOLOCATION_WIN7_LOCATION_API_WIN_H_
#define CONTENT_BROWSER_GEOLOCATION_WIN7_LOCATION_API_WIN_H_
-#include <windows.h>
#include <atlbase.h>
#include <atlcom.h>
#include <locationapi.h>
#include <sensors.h>
+#include <Windows.h>
+#include "app/win/scoped_com_initializer.h"
#include "base/time.h"
-#include "base/win/scoped_com_initializer.h"
struct Geoposition;
@@ -50,7 +50,7 @@
virtual bool GetPositionIfFixed(Geoposition* position);
// Ensure that COM has been initialized for this thread.
- base::win::ScopedCOMInitializer com_initializer_;
+ app::win::ScopedCOMInitializer com_initializer_;
// ILocation object that lets us communicate with the Location and
// Sensors platform.
CComPtr<ILocation> locator_;
« no previous file with comments | « chrome_frame/test/url_request_test.cc ('k') | content/common/gpu/gpu_channel_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698