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

Unified Diff: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

Issue 1680033004: Move gtk-specific browser main parts stuff to its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, fix ToolkitInitialized() Created 4 years, 10 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/browser/ui/aura/chrome_browser_main_extra_parts_aura.h ('k') | chrome/browser/ui/views/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
deleted file mode 100644
index 10673a313a9a83eea42f5e1a1a2b6aa2624cd04d..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
+++ /dev/null
@@ -1,162 +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.
-
-#include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h"
-
-#include "base/command_line.h"
-#include "base/run_loop.h"
-#include "build/build_config.h"
-#include "chrome/browser/chrome_browser_main.h"
-#include "chrome/browser/ui/host_desktop.h"
-#include "chrome/browser/ui/simple_message_box.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/grit/chromium_strings.h"
-#include "chrome/grit/generated_resources.h"
-#include "ui/aura/env.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/ui_base_switches.h"
-#include "ui/gfx/screen.h"
-#include "ui/views/widget/native_widget_aura.h"
-
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/themes/theme_service.h"
-#include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/common/pref_names.h"
-#include "components/prefs/pref_service.h"
-#include "ui/aura/window.h"
-#include "ui/native_theme/native_theme_aura.h"
-#include "ui/native_theme/native_theme_dark_aura.h"
-#include "ui/views/linux_ui/linux_ui.h"
-#endif
-
-#if defined(USE_X11) && !defined(OS_CHROMEOS)
-#include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
-#endif
-
-#if defined(USE_ASH)
-#include "chrome/browser/ui/ash/ash_util.h"
-#endif // defined(USE_ASH)
-
-#if !defined(OS_CHROMEOS)
-#include "ui/views/widget/desktop_aura/desktop_screen.h"
-#endif
-
-namespace {
-
-#if defined(USE_X11) && !defined(OS_CHROMEOS)
-ui::NativeTheme* GetNativeThemeForWindow(aura::Window* window) {
- if (!window)
- return nullptr;
-
- Profile* profile = nullptr;
- // Window types not listed here (such as tooltips) will never use Chrome
- // theming.
- if (window->type() == ui::wm::WINDOW_TYPE_NORMAL ||
- window->type() == ui::wm::WINDOW_TYPE_POPUP) {
- profile = reinterpret_cast<Profile*>(
- window->GetNativeWindowProperty(Profile::kProfileKey));
- }
-
- // If using the system (GTK) theme, don't use an Aura NativeTheme at all.
- // NB: ThemeService::UsingSystemTheme() might lag behind this pref. See
- // http://crbug.com/585522
- if (!profile || profile->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme))
- return nullptr;
-
- // Use a dark theme for incognito browser windows that aren't
- // custom-themed. Otherwise, normal Aura theme.
- if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE &&
- ThemeServiceFactory::GetForProfile(profile)->UsingDefaultTheme() &&
- BrowserView::GetBrowserViewForNativeWindow(window)) {
- return ui::NativeThemeDarkAura::instance();
- }
-
- return ui::NativeThemeAura::instance();
-}
-#endif
-
-} // namespace
-
-ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() {
-}
-
-ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() {
-}
-
-void ChromeBrowserMainExtraPartsAura::PreEarlyInitialization() {
-#if defined(USE_X11) && !defined(OS_CHROMEOS)
- // TODO(erg): Refactor this into a dlopen call when we add a GTK3 port.
- views::LinuxUI* gtk2_ui = BuildGtk2UI();
- gtk2_ui->SetNativeThemeOverride(base::Bind(&GetNativeThemeForWindow));
- views::LinuxUI::SetInstance(gtk2_ui);
-#endif
-}
-
-void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() {
-#if defined(USE_X11) && !defined(OS_CHROMEOS)
- views::LinuxUI::instance()->Initialize();
-#endif
-}
-
-void ChromeBrowserMainExtraPartsAura::PreCreateThreads() {
-#if !defined(OS_CHROMEOS)
-#if defined(USE_ASH)
- bool should_open_ash = chrome::ShouldOpenAshOnStartup();
-#else
- bool should_open_ash = false;
-#endif
- if (!should_open_ash) {
- gfx::Screen* screen = views::CreateDesktopScreen();
- gfx::Screen::SetScreenInstance(screen);
-#if defined(USE_X11)
- views::LinuxUI::instance()->UpdateDeviceScaleFactor(
- screen->GetPrimaryDisplay().device_scale_factor());
-#endif
- }
-#endif
-}
-
-void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
- // Now that we have some minimal ui initialized, check to see if we're
- // running as root and bail if we are.
- DetectRunningAsRoot();
-#endif
-}
-
-void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
- // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown
- // after the metrics service is deleted.
-}
-
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-void ChromeBrowserMainExtraPartsAura::DetectRunningAsRoot() {
- if (getuid() == 0) {
- const base::CommandLine& command_line =
- *base::CommandLine::ForCurrentProcess();
- if (command_line.HasSwitch(switches::kUserDataDir))
- return;
-
- base::string16 title = l10n_util::GetStringFUTF16(
- IDS_REFUSE_TO_RUN_AS_ROOT,
- l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
- base::string16 message = l10n_util::GetStringFUTF16(
- IDS_REFUSE_TO_RUN_AS_ROOT_2,
- l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
-
- chrome::ShowMessageBox(NULL,
- title,
- message,
- chrome::MESSAGE_BOX_TYPE_WARNING);
-
- // Avoids gpu_process_transport_factory.cc(153)] Check failed:
- // per_compositor_data_.empty() when quit is chosen.
- base::RunLoop().RunUntilIdle();
-
- exit(EXIT_FAILURE);
- }
-}
-#endif
« no previous file with comments | « chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h ('k') | chrome/browser/ui/views/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698