Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h" | 5 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h" |
| 6 | 6 |
| 7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
| 8 #include <gdk/gdkx.h> | 8 #include <gdk/gdkx.h> |
| 9 #include <gtk/gtk.h> | 9 #include <gtk/gtk.h> |
| 10 #include <stddef.h> | 10 #include <stddef.h> |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 54 | 54 |
| 55 void GtkInitFromCommandLine(const base::CommandLine& command_line) { | 55 void GtkInitFromCommandLine(const base::CommandLine& command_line) { |
| 56 CommonInitFromCommandLine(command_line, gtk_init); | 56 CommonInitFromCommandLine(command_line, gtk_init); |
| 57 } | 57 } |
| 58 | 58 |
| 59 // TODO(erg): This method was copied out of shell_integration_linux.cc. Because | 59 // TODO(erg): This method was copied out of shell_integration_linux.cc. Because |
| 60 // of how this library is structured as a stand alone .so, we can't call code | 60 // of how this library is structured as a stand alone .so, we can't call code |
| 61 // from browser and above. | 61 // from browser and above. |
| 62 std::string GetDesktopName(base::Environment* env) { | 62 std::string GetDesktopName(base::Environment* env) { |
| 63 #if defined(GOOGLE_CHROME_BUILD) | 63 #if defined(GOOGLE_CHROME_BUILD) |
| 64 version_info::Channel product_channel(chrome::GetChannel()); | 64 return "google-chrome.desktop"; |
|
Lei Zhang
2016/07/29 20:37:23
IWYU @_@
| |
| 65 switch (product_channel) { | |
| 66 case version_info::Channel::DEV: | |
| 67 return "google-chrome-unstable.desktop"; | |
| 68 case version_info::Channel::BETA: | |
| 69 return "google-chrome-beta.desktop"; | |
| 70 default: | |
| 71 return "google-chrome.desktop"; | |
| 72 } | |
| 73 #else // CHROMIUM_BUILD | 65 #else // CHROMIUM_BUILD |
| 74 // Allow $CHROME_DESKTOP to override the built-in value, so that development | 66 // Allow $CHROME_DESKTOP to override the built-in value, so that development |
| 75 // versions can set themselves as the default without interfering with | 67 // versions can set themselves as the default without interfering with |
| 76 // non-official, packaged versions using the built-in value. | 68 // non-official, packaged versions using the built-in value. |
| 77 std::string name; | 69 std::string name; |
| 78 if (env->GetVar("CHROME_DESKTOP", &name) && !name.empty()) | 70 if (env->GetVar("CHROME_DESKTOP", &name) && !name.empty()) |
| 79 return name; | 71 return name; |
| 80 return "chromium-browser.desktop"; | 72 return "chromium-browser.desktop"; |
| 81 #endif | 73 #endif |
| 82 } | 74 } |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 143 aura::Window* GetAuraTransientParent(GtkWidget* dialog) { | 135 aura::Window* GetAuraTransientParent(GtkWidget* dialog) { |
| 144 return reinterpret_cast<aura::Window*>( | 136 return reinterpret_cast<aura::Window*>( |
| 145 g_object_get_data(G_OBJECT(dialog), kAuraTransientParent)); | 137 g_object_get_data(G_OBJECT(dialog), kAuraTransientParent)); |
| 146 } | 138 } |
| 147 | 139 |
| 148 void ClearAuraTransientParent(GtkWidget* dialog) { | 140 void ClearAuraTransientParent(GtkWidget* dialog) { |
| 149 g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, NULL); | 141 g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, NULL); |
| 150 } | 142 } |
| 151 | 143 |
| 152 } // namespace libgtk2ui | 144 } // namespace libgtk2ui |
| OLD | NEW |