This repository has been archived by the owner on Jan 4, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 114
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix broken build from disabling mac_views_browser
auditors @bsclifton @darkdh
- Loading branch information
Showing
6 changed files
with
68 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
// Copyright 2017 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_VIEWS_MODE_CONTROLLER__MAC_VIEWS_BROWSER_H_ | ||
#define CHROME_BROWSER_UI_VIEWS_MODE_CONTROLLER__MAC_VIEWS_BROWSER_H_ | ||
|
||
#include "../../../chrome/browser/ui/views_mode_controller.h" | ||
|
||
#include "ui/base/ui_base_features.h" | ||
|
||
#if defined(OS_MACOSX) && !BUILDFLAG(MAC_VIEWS_BROWSER) | ||
namespace features { | ||
UI_BASE_EXPORT extern const base::Feature kViewsBrowserWindows; | ||
UI_BASE_EXPORT bool IsViewsBrowserCocoa(); | ||
} // namespace features | ||
|
||
namespace views_mode_controller { | ||
bool IsViewsBrowserCocoa(); | ||
} // namespace views_mode_controller | ||
#endif // !BUILDFLAG(MAC_VIEWS_BROWSER) | ||
|
||
#endif // CHROME_BROWSER_UI_VIEWS_MODE_CONTROLLER__MAC_VIEWS_BROWSER_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
// Copyright 2017 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 UI_BASE_UI_BASE_FEATURES_MAC_VIEWS_BROWSER_H_ | ||
#define UI_BASE_UI_BASE_FEATURES_MAC_VIEWS_BROWSER_H_ | ||
|
||
#include "../../../../ui/base/ui_base_features.h" | ||
|
||
#if defined(OS_MACOSX) && !BUILDFLAG(MAC_VIEWS_BROWSER) | ||
namespace features { | ||
UI_BASE_EXPORT extern const base::Feature kViewsBrowserWindows; | ||
UI_BASE_EXPORT bool IsViewsBrowserCocoa(); | ||
} // namespace features | ||
|
||
namespace views_mode_controller { | ||
bool IsViewsBrowserCocoa(); | ||
} // namespace views_mode_controller | ||
#endif // !BUILDFLAG(MAC_VIEWS_BROWSER) | ||
|
||
#endif // UI_BASE_UI_BASE_FEATURES_MAC_VIEWS_BROWSER_H_ |
23 changes: 23 additions & 0 deletions
23
chromium_src/ui/base/ui_base_features_mac_views_browser.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#include "ui/base/ui_base_features.h" | ||
|
||
#include "ui/base/ui_base_switches_util.h" | ||
|
||
#if defined(OS_MACOSX) && !BUILDFLAG(MAC_VIEWS_BROWSER) | ||
|
||
namespace features { | ||
|
||
bool IsViewsBrowserCocoa() { | ||
return false; | ||
} | ||
|
||
} // namespace features | ||
|
||
namespace views_mode_controller { | ||
|
||
bool IsViewsBrowserCocoa() { | ||
return features::IsViewsBrowserCocoa(); | ||
} | ||
|
||
} // namespace views_mode_controller | ||
|
||
#endif |