diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 19:38:20 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 19:38:20 +0000 |
| commit | a990cadcd72c85cdb4988fc0d4438c45feae7fa8 (patch) | |
| tree | ef016cd48e52e16fce90348333a67504144a84d5 /win8/metro_driver/settings_handler.h | |
| parent | 9079783b942daa474fe3d1b8ca1ef3919081716b (diff) | |
| download | chromium_src-a990cadcd72c85cdb4988fc0d4438c45feae7fa8.zip chromium_src-a990cadcd72c85cdb4988fc0d4438c45feae7fa8.tar.gz chromium_src-a990cadcd72c85cdb4988fc0d4438c45feae7fa8.tar.bz2 | |
Revert 155444 - Integrate the Windows 8 code into the Chromium tree (take 2).
14>delegate_execute.cc(113):error C2039: 'kWaitForHandle' : is not a member of 'switches'
14>delegate_execute.cc(113):error C2065: 'kWaitForHandle' : undeclared identifier
http://build.chromium.org/p/chromium/builders/Win%20Builder%20%28dbg%29/builds/38971/steps/compile/logs/stdio#error1
This time, also: fix invalid path in metro_driver.gyp. Also, set executable bit on check_sdk_patch.py and post_build.bat.
This reverts "Revert 155429 - Integrate the Windows 8 code into the Chromium tree."
Original CL: https://chromiumcodereview.appspot.com/10875008
BUG=127799
TEST=A Chromium build can run as the immersive browser on Windows 8.
TBR=ben
Review URL: https://chromiumcodereview.appspot.com/10912152
TBR=robertshield@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10918127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155452 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver/settings_handler.h')
| -rw-r--r-- | win8/metro_driver/settings_handler.h | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/win8/metro_driver/settings_handler.h b/win8/metro_driver/settings_handler.h deleted file mode 100644 index 5b234ad..0000000 --- a/win8/metro_driver/settings_handler.h +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) 2012 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 CHROME_BROWSER_UI_METRO_DRIVER_SETTINGS_HANDLER_H_ -#define CHROME_BROWSER_UI_METRO_DRIVER_SETTINGS_HANDLER_H_ - -#include <windows.ui.applicationsettings.h> -#include <windows.ui.popups.h> - -#include "winrt_utils.h" - -// This class handles the settings charm. -class SettingsHandler { - public: - SettingsHandler(); - ~SettingsHandler(); - - HRESULT Initialize(); - - private: - typedef winfoundtn::Collections::IVector< - winui::ApplicationSettings::SettingsCommand*> ISettingsCommandVector; - - HRESULT OnSettingsCommandsRequested( - winui::ApplicationSettings::ISettingsPane* settings_pane, - winui::ApplicationSettings:: - ISettingsPaneCommandsRequestedEventArgs* args); - - HRESULT AppendNewSettingsCommand( - const wchar_t* id, - const wchar_t* name, - winui::ApplicationSettings::ISettingsCommandFactory* - settings_command_factory, - ISettingsCommandVector* settings_command_vector); - - static HRESULT OnSettings(winui::Popups::IUICommand* command); - static HRESULT GetSettingsId(const wchar_t* value, - winfoundtn::IPropertyValue** settings_id); - - EventRegistrationToken settings_token_; -}; - -#endif // CHROME_BROWSER_UI_METRO_DRIVER_SETTINGS_HANDLER_H_ |