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

Side by Side Diff: chrome/browser/gtk/reload_button_gtk.cc

Issue 2847079: Remove support for background masks. These are no longer necessary in the ne... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/gtk/find_bar_gtk.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/gtk/reload_button_gtk.h" 5 #include "chrome/browser/gtk/reload_button_gtk.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "chrome/app/chrome_dll_resource.h" 9 #include "chrome/app/chrome_dll_resource.h"
10 #include "chrome/browser/browser.h" 10 #include "chrome/browser/browser.h"
(...skipping 13 matching lines...) Expand all
24 ReloadButtonGtk::ReloadButtonGtk(LocationBarViewGtk* location_bar, 24 ReloadButtonGtk::ReloadButtonGtk(LocationBarViewGtk* location_bar,
25 Browser* browser) 25 Browser* browser)
26 : location_bar_(location_bar), 26 : location_bar_(location_bar),
27 browser_(browser), 27 browser_(browser),
28 button_delay_(0), 28 button_delay_(0),
29 pretend_timer_is_running_for_unittest_(false), 29 pretend_timer_is_running_for_unittest_(false),
30 intended_mode_(MODE_RELOAD), 30 intended_mode_(MODE_RELOAD),
31 visible_mode_(MODE_RELOAD), 31 visible_mode_(MODE_RELOAD),
32 theme_provider_(browser ? 32 theme_provider_(browser ?
33 GtkThemeProvider::GetFrom(browser->profile()) : NULL), 33 GtkThemeProvider::GetFrom(browser->profile()) : NULL),
34 reload_(theme_provider_, IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0, 34 reload_(theme_provider_, IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0),
35 IDR_BUTTON_MASK), 35 stop_(theme_provider_, IDR_STOP, IDR_STOP_P, IDR_STOP_H, 0),
36 stop_(theme_provider_, IDR_STOP, IDR_STOP_P, IDR_STOP_H, 0,
37 IDR_BUTTON_MASK),
38 widget_(gtk_chrome_button_new()) { 36 widget_(gtk_chrome_button_new()) {
39 gtk_widget_set_size_request(widget_.get(), reload_.Width(), reload_.Height()); 37 gtk_widget_set_size_request(widget_.get(), reload_.Width(), reload_.Height());
40 38
41 gtk_widget_set_app_paintable(widget_.get(), TRUE); 39 gtk_widget_set_app_paintable(widget_.get(), TRUE);
42 40
43 g_signal_connect(widget_.get(), "expose-event", 41 g_signal_connect(widget_.get(), "expose-event",
44 G_CALLBACK(OnExposeThunk), this); 42 G_CALLBACK(OnExposeThunk), this);
45 g_signal_connect(widget_.get(), "leave-notify-event", 43 g_signal_connect(widget_.get(), "leave-notify-event",
46 G_CALLBACK(OnLeaveNotifyThunk), this); 44 G_CALLBACK(OnLeaveNotifyThunk), this);
47 g_signal_connect(widget_.get(), "clicked", 45 g_signal_connect(widget_.get(), "clicked",
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 reload_.Height()); 207 reload_.Height());
210 208
211 gtk_widget_set_app_paintable(widget_.get(), TRUE); 209 gtk_widget_set_app_paintable(widget_.get(), TRUE);
212 // We effectively double-buffer by virtue of having only one image... 210 // We effectively double-buffer by virtue of having only one image...
213 gtk_widget_set_double_buffered(widget_.get(), FALSE); 211 gtk_widget_set_double_buffered(widget_.get(), FALSE);
214 } 212 }
215 213
216 gtk_chrome_button_set_use_gtk_rendering( 214 gtk_chrome_button_set_use_gtk_rendering(
217 GTK_CHROME_BUTTON(widget_.get()), use_gtk); 215 GTK_CHROME_BUTTON(widget_.get()), use_gtk);
218 } 216 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/find_bar_gtk.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698