summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser.cc8
-rw-r--r--chrome/browser/browser.h2
-rw-r--r--chrome/browser/browser_init.cc4
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc16
-rw-r--r--chrome/browser/gtk/browser_window_gtk.h6
-rwxr-xr-xchrome/browser/gtk/tabs/tab_strip_gtk.cc14
-rw-r--r--chrome/browser/gtk/tabs/tab_strip_gtk.h4
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc2
-rw-r--r--chrome/browser/views/tabs/dragged_tab_view.h4
-rw-r--r--chrome/chrome.gyp10
10 files changed, 36 insertions, 34 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 5d08f29..157fa09 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -444,7 +444,7 @@ std::wstring Browser::GetCurrentPageTitle() const {
if (title.empty())
title = l10n_util::GetString(IDS_TAB_UNTITLED_TITLE);
-#if defined(OS_MACOSX) || defined(LINUX2)
+#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
// On Mac, we don't want to suffix the page title with the application name.
return title;
#elif defined(OS_WIN) || defined(OS_LINUX)
@@ -1162,7 +1162,7 @@ void Browser::OpenHelpTab() {
false, NULL);
}
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
void Browser::ShowControlPanel() {
GURL url("http://localhost:8080");
AddTabWithURL(url, GURL(), PageTransition::AUTO_BOOKMARK, true, -1,
@@ -1381,7 +1381,7 @@ void Browser::ExecuteCommandWithDisposition(
case IDC_IMPORT_SETTINGS: OpenImportSettingsDialog(); break;
case IDC_ABOUT: OpenAboutChromeDialog(); break;
case IDC_HELP_PAGE: OpenHelpTab(); break;
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
case IDC_CONTROL_PANEL: ShowControlPanel(); break;
#endif
@@ -2133,7 +2133,7 @@ void Browser::InitCommandState() {
command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true);
command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE, true);
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
command_updater_.UpdateCommandEnabled(IDC_CONTROL_PANEL, true);
#endif
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 819b551..d570804 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -369,7 +369,7 @@ class Browser : public TabStripModelDelegate,
void OpenImportSettingsDialog();
void OpenAboutChromeDialog();
void OpenHelpTab();
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
void ShowControlPanel();
#endif
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index e9690b5..fdb85ea 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -60,7 +60,7 @@
#include "base/win_util.h"
#endif
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
#include "chrome/browser/views/tabs/tab_overview_message_listener.h"
#endif
@@ -341,7 +341,7 @@ bool LaunchBrowser(const CommandLine& command_line, Profile* profile,
return false;
}
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
// Create the TabOverviewMessageListener so that it can listen for messages
// regardless of what window has focus.
TabOverviewMessageListener::instance();
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 1da4fd5..2c7c39a 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -55,7 +55,7 @@
#include "grit/app_resources.h"
#include "grit/theme_resources.h"
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
#include "chrome/browser/views/panel_controller.h"
#include "chrome/browser/views/tabs/tab_overview_types.h"
#endif
@@ -221,7 +221,7 @@ const struct AcceleratorMapping {
{ GDK_p, IDC_PRINT, GDK_CONTROL_MASK },
{ GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK },
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
{ GDK_f, IDC_FULLSCREEN,
GdkModifierType(GDK_CONTROL_MASK | GDK_MOD1_MASK) },
{ GDK_Delete, IDC_TASK_MANAGER,
@@ -366,7 +366,7 @@ std::map<XID, GtkWindow*> BrowserWindowGtk::xid_map_;
BrowserWindowGtk::BrowserWindowGtk(Browser* browser)
: browser_(browser),
full_screen_(false),
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
drag_active_(false),
panel_controller_(NULL),
#endif
@@ -474,7 +474,7 @@ void BrowserWindowGtk::Show() {
// the previous browser instead if we don't explicitly set it here.
BrowserList::SetLastActive(browser());
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
if (browser_->type() == Browser::TYPE_POPUP) {
panel_controller_ = new PanelController(this);
} else {
@@ -514,7 +514,7 @@ void BrowserWindowGtk::Close() {
window_ = NULL;
gtk_widget_destroy(window);
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
if (panel_controller_) {
panel_controller_->Close();
}
@@ -554,7 +554,7 @@ void BrowserWindowGtk::SelectedTabToolbarSizeChanged(bool is_animating) {
}
void BrowserWindowGtk::UpdateTitleBar() {
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
if (panel_controller_)
panel_controller_->UpdateTitleBar();
#endif
@@ -880,7 +880,7 @@ void BrowserWindowGtk::OnStateChanged(GdkWindowState state) {
}
bool BrowserWindowGtk::CanClose() const {
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
if (drag_active_)
return false;
#endif
@@ -1054,7 +1054,7 @@ void BrowserWindowGtk::InitWidgets() {
contents_container_->AddContainerToBox(render_area_vbox_);
gtk_widget_show_all(render_area_vbox_);
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
if (browser_->type() == Browser::TYPE_POPUP) {
toolbar_->Hide();
// The window manager needs the min size for popups
diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h
index 3045236..cf55189 100644
--- a/chrome/browser/gtk/browser_window_gtk.h
+++ b/chrome/browser/gtk/browser_window_gtk.h
@@ -32,7 +32,7 @@ class StatusBubbleGtk;
class TabContentsContainerGtk;
class TabStripGtk;
-#ifdef LINUX2
+#ifdef OS_CHROMEOS
class PanelController;
#endif
@@ -132,7 +132,7 @@ class BrowserWindowGtk : public BrowserWindow,
// Add the find bar widget to the window hierarchy.
void AddFindBar(FindBarGtk* findbar);
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
// Sets whether a drag is active. If a drag is active the window will not
// close.
void set_drag_active(bool drag_active) { drag_active_ = drag_active; }
@@ -296,7 +296,7 @@ class BrowserWindowGtk : public BrowserWindow,
// decorations.
BooleanPrefMember use_custom_frame_;
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
// True if a drag is active. See description above setter for details.
bool drag_active_;
// Controls interactions with the window manager for popup panels.
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
index 6488ac8..ab88546 100755
--- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
@@ -23,7 +23,7 @@
#include "grit/app_resources.h"
#include "grit/theme_resources.h"
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/gtk/browser_window_gtk.h"
@@ -501,7 +501,7 @@ void TabStripGtk::Init() {
newtab_button_.reset(MakeNewTabButton());
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
tab_overview_button_.reset(MakeTabOverviewButton());
#endif
@@ -543,7 +543,7 @@ void TabStripGtk::Layout() {
}
LayoutNewTabButton(static_cast<double>(tab_right), current_unselected_width_);
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
gtk_fixed_move(GTK_FIXED(tabstrip_.get()), tab_overview_button_->widget(),
bounds_.width() - tab_overview_button_->width(), 0);
#endif
@@ -985,7 +985,7 @@ void TabStripGtk::LayoutNewTabButton(double last_tab_right,
// We're shrinking tabs, so we need to anchor the New Tab button to the
// right edge of the TabStrip's bounds, rather than the right edge of the
// right-most Tab, otherwise it'll bounce when animating.
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
bounds.set_x(bounds_.width() - newtab_button_->width() -
tab_overview_button_->width());
#else
@@ -1021,7 +1021,7 @@ void TabStripGtk::GetDesiredTabWidths(int tab_count,
available_width = bounds_.width();
available_width -=
(kNewTabButtonHOffset + newtab_button_->width());
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
available_width -= tab_overview_button_->width();
#endif
} else {
@@ -1453,7 +1453,7 @@ gboolean TabStripGtk::OnExpose(GtkWidget* widget, GdkEventExpose* event,
gtk_container_propagate_expose(GTK_CONTAINER(tabstrip->tabstrip_.get()),
tabstrip->newtab_button_->widget(), event);
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
// Paint the tab overview button.
gtk_container_propagate_expose(GTK_CONTAINER(tabstrip->tabstrip_.get()),
tabstrip->tab_overview_button_->widget(), event);
@@ -1595,7 +1595,7 @@ CustomDrawButton* TabStripGtk::MakeNewTabButton() {
return button;
}
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
CustomDrawButton* TabStripGtk::MakeTabOverviewButton() {
CustomDrawButton* button =
new CustomDrawButton(IDR_TAB_OVERVIEW_BUTTON_ICON, 0, 0, 0, NULL);
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.h b/chrome/browser/gtk/tabs/tab_strip_gtk.h
index c7c3b1f..1add69e 100644
--- a/chrome/browser/gtk/tabs/tab_strip_gtk.h
+++ b/chrome/browser/gtk/tabs/tab_strip_gtk.h
@@ -331,7 +331,7 @@ class TabStripGtk : public TabStripModelObserver,
// Optionally a full Layout will be performed, specified by |layout|.
void FinishAnimation(TabAnimation* animation, bool layout);
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
// Creates and returns the tab overview button.
CustomDrawButton* MakeTabOverviewButton();
@@ -379,7 +379,7 @@ class TabStripGtk : public TabStripModelObserver,
// The New Tab button.
scoped_ptr<CustomDrawButton> newtab_button_;
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
// The tab overview button.
scoped_ptr<CustomDrawButton> tab_overview_button_;
#endif
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 4b3360f..de13654 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -257,7 +257,7 @@ TabContents::TabContents(Profile* profile,
pending_install_.page_id = 0;
pending_install_.callback_functor = NULL;
-#if defined(LINUX2)
+#if defined(OS_CHROMEOS)
// Make sure the thumbnailer is started before starting the render manager.
// The thumbnailer will want to listen for RVH creations, one of which will
// happen in RVHManager::Init.
diff --git a/chrome/browser/views/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h
index 3651983..e01db5c 100644
--- a/chrome/browser/views/tabs/dragged_tab_view.h
+++ b/chrome/browser/views/tabs/dragged_tab_view.h
@@ -83,9 +83,11 @@ class DraggedTabView : public views::View,
// Utility for scaling a size by the current scaling factor.
int ScaleValue(int value);
-#if defined(OS_WIN)
// The window that contains the DraggedTabView.
+#if defined(OS_WIN)
scoped_ptr<views::WidgetWin> container_;
+#elif defined(OS_LINUX)
+ scoped_ptr<views::WidgetGtk> container_;
#endif
// The renderer that paints the Tab shape.
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 26cd2a7..a5b58a2 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -230,8 +230,8 @@
'-D', '<(chrome_build)'
],
'conditions': [
- ['linux2==1', {
- 'action': ['-D', 'linux2'],
+ ['chromeos==1', {
+ 'action': ['-D', 'chromeos'],
}],
],
'message': 'Generating resources from <(input_path)',
@@ -2080,7 +2080,7 @@
['exclude', '^browser/tab_contents/render_view_context_menu_gtk.h'],
],
}],
- ['linux2==1',{
+ ['chromeos==1',{
'sources/': [
['include', 'browser/views/new_browser_window_widget.cc'],
['include', 'browser/views/new_browser_window_widget.h'],
@@ -2552,7 +2552,7 @@
},
],
}],
- ['OS=="linux" and (toolkit_views==1 or linux2==1)', {
+ ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
'dependencies': [
'../views/views.gyp:views',
],
@@ -3661,7 +3661,7 @@
'../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
],
}],
- ['OS=="linux" and (toolkit_views==1 or linux2==1)', {
+ ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
'dependencies': [
'../views/views.gyp:views',
],
generated by cgit v1.1 at 2025-02-01 23:02:43 +0000