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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 8566052: views: Delete bubble, events, focus, layout directories and its stubbed files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 9 years, 1 month 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/browser_process_impl.cc ('k') | chrome/browser/chrome_browser_main_win.cc » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 176
177 #if defined(OS_MACOSX) 177 #if defined(OS_MACOSX)
178 #include <Security/Security.h> 178 #include <Security/Security.h>
179 179
180 #include "base/mac/scoped_nsautorelease_pool.h" 180 #include "base/mac/scoped_nsautorelease_pool.h"
181 #include "chrome/browser/mac/install_from_dmg.h" 181 #include "chrome/browser/mac/install_from_dmg.h"
182 #include "chrome/browser/mac/keystone_glue.h" 182 #include "chrome/browser/mac/keystone_glue.h"
183 #endif 183 #endif
184 184
185 #if defined(TOOLKIT_VIEWS) 185 #if defined(TOOLKIT_VIEWS)
186 #include "views/focus/accelerator_handler.h" 186 #include "ui/views/focus/accelerator_handler.h"
187 #endif 187 #endif
188 188
189 #if defined(TOOLKIT_USES_GTK) 189 #if defined(TOOLKIT_USES_GTK)
190 #include "chrome/browser/ui/gtk/gtk_util.h" 190 #include "chrome/browser/ui/gtk/gtk_util.h"
191 #include "ui/gfx/gtk_util.h" 191 #include "ui/gfx/gtk_util.h"
192 #endif 192 #endif
193 193
194 #if defined(TOUCH_UI) 194 #if defined(TOUCH_UI)
195 #include "ui/base/touch/touch_factory.h" 195 #include "ui/base/touch/touch_factory.h"
196 #endif 196 #endif
(...skipping 1889 matching lines...) Expand 10 before | Expand all | Expand 10 after
2086 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2086 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2087 (pre_read == "0" || pre_read == "1")) { 2087 (pre_read == "0" || pre_read == "1")) {
2088 std::string uma_name(name); 2088 std::string uma_name(name);
2089 uma_name += "_PreRead"; 2089 uma_name += "_PreRead";
2090 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2090 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2091 AddPreReadHistogramTime(uma_name.c_str(), time); 2091 AddPreReadHistogramTime(uma_name.c_str(), time);
2092 } 2092 }
2093 #endif 2093 #endif
2094 #endif 2094 #endif
2095 } 2095 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/chrome_browser_main_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698