diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:32:59 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:32:59 +0000 |
| commit | 93270d001be703684c1c1bd1e28be7e553a19c99 (patch) | |
| tree | 4161c4c8fdef06ab6b9e0252134eb1a83e94777a /chrome/browser/dom_ui | |
| parent | af463aeaf8ab763f9afdf7193a52238f9bb18fc7 (diff) | |
| download | chromium_src-93270d001be703684c1c1bd1e28be7e553a19c99.zip chromium_src-93270d001be703684c1c1bd1e28be7e553a19c99.tar.gz chromium_src-93270d001be703684c1c1bd1e28be7e553a19c99.tar.bz2 | |
Update references part 3: remaining files in chrome/...
Update chrome/browser/gtk references & copyright dates of touched files.
Re-alphabetize include lists as necessary from this change.
Manually merge r71828
svn pset svn:eol-style LF \
chrome/browser/automation/testing_automation_provider_gtk.cc \
chrome/browser/speech/speech_input_bubble_gtk.cc
BUG=69289
TEST=none
Review URL: http://codereview.chromium.org/6245006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/ntp_resource_cache.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/options/certificate_manager_handler.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/options/personal_options_handler.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc index 35f572b..ee716eb 100644 --- a/chrome/browser/dom_ui/ntp_resource_cache.cc +++ b/chrome/browser/dom_ui/ntp_resource_cache.cc @@ -47,7 +47,7 @@ #elif defined(OS_MACOSX) #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" #elif defined(OS_POSIX) -#include "chrome/browser/gtk/bookmark_bar_gtk.h" +#include "chrome/browser/ui/gtk/bookmark_bar_gtk.h" #endif using base::Time; diff --git a/chrome/browser/dom_ui/options/certificate_manager_handler.cc b/chrome/browser/dom_ui/options/certificate_manager_handler.cc index c337f77..ef7185d 100644 --- a/chrome/browser/dom_ui/options/certificate_manager_handler.cc +++ b/chrome/browser/dom_ui/options/certificate_manager_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,10 +15,10 @@ #include "chrome/browser/browser_thread.h" // for FileAccessProvider #include "chrome/browser/certificate_manager_model.h" #include "chrome/browser/certificate_viewer.h" -#include "chrome/browser/gtk/certificate_dialogs.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" +#include "chrome/browser/ui/gtk/certificate_dialogs.h" #include "grit/generated_resources.h" #include "net/base/crypto_module.h" #include "net/base/x509_certificate.h" diff --git a/chrome/browser/dom_ui/options/personal_options_handler.cc b/chrome/browser/dom_ui/options/personal_options_handler.cc index 0b31d8f..75216b1 100644 --- a/chrome/browser/dom_ui/options/personal_options_handler.cc +++ b/chrome/browser/dom_ui/options/personal_options_handler.cc @@ -25,9 +25,9 @@ #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/options/options_page_base.h" #include "chrome/browser/ui/options/options_window.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/notification_service.h" -#include "chrome/common/chrome_paths.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -38,7 +38,7 @@ #include "chrome/browser/chromeos/login/user_manager.h" #endif // defined(OS_CHROMEOS) #if defined(TOOLKIT_GTK) -#include "chrome/browser/gtk/gtk_theme_provider.h" +#include "chrome/browser/ui/gtk/gtk_theme_provider.h" #endif // defined(TOOLKIT_GTK) PersonalOptionsHandler::PersonalOptionsHandler() { |