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

Side by Side Diff: chrome/browser/ui/libgtk2ui/gtk2_util.cc

Issue 832953002: Cleanup: Update the path to gfx size headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 5 years, 11 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
OLDNEW
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 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/debug/leak_annotations.h" 12 #include "base/debug/leak_annotations.h"
13 #include "base/environment.h" 13 #include "base/environment.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
16 #include "ui/aura/window_tree_host.h" 16 #include "ui/aura/window_tree_host.h"
17 #include "ui/base/accelerators/accelerator.h" 17 #include "ui/base/accelerators/accelerator.h"
18 #include "ui/events/event_constants.h" 18 #include "ui/events/event_constants.h"
19 #include "ui/events/keycodes/keyboard_code_conversion_x.h" 19 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
20 #include "ui/gfx/size.h" 20 #include "ui/gfx/geometry/size.h"
21 21
22 namespace { 22 namespace {
23 23
24 const char kAuraTransientParent[] = "aura-transient-parent"; 24 const char kAuraTransientParent[] = "aura-transient-parent";
25 25
26 void CommonInitFromCommandLine(const base::CommandLine& command_line, 26 void CommonInitFromCommandLine(const base::CommandLine& command_line,
27 void (*init_func)(gint*, gchar***)) { 27 void (*init_func)(gint*, gchar***)) {
28 const std::vector<std::string>& args = command_line.argv(); 28 const std::vector<std::string>& args = command_line.argv();
29 int argc = args.size(); 29 int argc = args.size();
30 scoped_ptr<char *[]> argv(new char *[argc + 1]); 30 scoped_ptr<char *[]> argv(new char *[argc + 1]);
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 case ui::NativeTheme::kDisabled: return GTK_STATE_INSENSITIVE; 140 case ui::NativeTheme::kDisabled: return GTK_STATE_INSENSITIVE;
141 case ui::NativeTheme::kHovered: return GTK_STATE_PRELIGHT; 141 case ui::NativeTheme::kHovered: return GTK_STATE_PRELIGHT;
142 case ui::NativeTheme::kNormal: return GTK_STATE_NORMAL; 142 case ui::NativeTheme::kNormal: return GTK_STATE_NORMAL;
143 case ui::NativeTheme::kPressed: return GTK_STATE_ACTIVE; 143 case ui::NativeTheme::kPressed: return GTK_STATE_ACTIVE;
144 case ui::NativeTheme::kNumStates: NOTREACHED(); 144 case ui::NativeTheme::kNumStates: NOTREACHED();
145 } 145 }
146 return GTK_STATE_NORMAL; 146 return GTK_STATE_NORMAL;
147 } 147 }
148 148
149 } // namespace libgtk2ui 149 } // namespace libgtk2ui
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_ui.cc ('k') | chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698