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

Side by Side Diff: chrome/browser/ui/browser_init.cc

Issue 6901058: Increase infobar height and infobar button height for touch. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Undo inadvertant merge changes (hopefully). Created 9 years, 7 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
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/ui/browser_init.h" 5 #include "chrome/browser/ui/browser_init.h"
6 6
7 #include <algorithm> // For max(). 7 #include <algorithm> // For max().
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #include "content/browser/child_process_security_policy.h" 61 #include "content/browser/child_process_security_policy.h"
62 #include "content/browser/renderer_host/render_process_host.h" 62 #include "content/browser/renderer_host/render_process_host.h"
63 #include "content/browser/tab_contents/navigation_controller.h" 63 #include "content/browser/tab_contents/navigation_controller.h"
64 #include "content/browser/tab_contents/tab_contents.h" 64 #include "content/browser/tab_contents/tab_contents.h"
65 #include "content/browser/tab_contents/tab_contents_view.h" 65 #include "content/browser/tab_contents/tab_contents_view.h"
66 #include "content/common/result_codes.h" 66 #include "content/common/result_codes.h"
67 #include "grit/chromium_strings.h" 67 #include "grit/chromium_strings.h"
68 #include "grit/generated_resources.h" 68 #include "grit/generated_resources.h"
69 #include "grit/locale_settings.h" 69 #include "grit/locale_settings.h"
70 #include "grit/theme_resources.h" 70 #include "grit/theme_resources.h"
71 #include "grit/theme_resources_standard.h"
71 #include "net/base/net_util.h" 72 #include "net/base/net_util.h"
72 #include "net/url_request/url_request.h" 73 #include "net/url_request/url_request.h"
73 #include "ui/base/l10n/l10n_util.h" 74 #include "ui/base/l10n/l10n_util.h"
74 #include "ui/base/resource/resource_bundle.h" 75 #include "ui/base/resource/resource_bundle.h"
75 #include "webkit/glue/webkit_glue.h" 76 #include "webkit/glue/webkit_glue.h"
76 77
77 #if defined(OS_MACOSX) 78 #if defined(OS_MACOSX)
78 #include "chrome/browser/ui/cocoa/keystone_infobar.h" 79 #include "chrome/browser/ui/cocoa/keystone_infobar.h"
79 #endif 80 #endif
80 81
(...skipping 1310 matching lines...) Expand 10 before | Expand all | Expand 10 after
1391 return false; 1392 return false;
1392 automation->SetExpectedTabCount(expected_tabs); 1393 automation->SetExpectedTabCount(expected_tabs);
1393 1394
1394 AutomationProviderList* list = 1395 AutomationProviderList* list =
1395 g_browser_process->InitAutomationProviderList(); 1396 g_browser_process->InitAutomationProviderList();
1396 DCHECK(list); 1397 DCHECK(list);
1397 list->AddProvider(automation); 1398 list->AddProvider(automation);
1398 1399
1399 return true; 1400 return true;
1400 } 1401 }
OLDNEW
« no previous file with comments | « chrome/browser/translate/translate_infobar_delegate.cc ('k') | chrome/browser/ui/collected_cookies_infobar_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698