Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / omnibox / omnibox_view_views.cc

diff --git a/src/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/src/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 8f46c64..1012e3a 100644 (file)
--- a/src/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/src/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -23,15 +23,13 @@
 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"
 #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h"
 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
+#include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 #include "components/omnibox/autocomplete_input.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "components/omnibox/omnibox_field_trial.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
-#include "grit/app_locale_settings.h"
-#include "grit/generated_resources.h"
-#include "grit/ui_strings.h"
 #include "net/base/escape.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_view_state.h"
@@ -49,6 +47,7 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/selection_model.h"
+#include "ui/strings/grit/ui_strings.h"
 #include "ui/views/border.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/textfield/textfield.h"
@@ -820,7 +819,6 @@ void OmniboxViewViews::GetAccessibleState(ui::AXViewState* state) {
         base::Bind(&OmniboxViewViews::AccessibilitySetValue,
                    weak_ptr_factory_.GetWeakPtr());
   }
-
 }
 
 void OmniboxViewViews::OnFocus() {
@@ -955,8 +953,7 @@ void OmniboxViewViews::OnAfterCutOrCopy(ui::ClipboardType clipboard_type) {
     data.ReadFromTuple(url, selected_text);
     data.WriteToClipboard(clipboard_type);
   } else {
-    ui::ScopedClipboardWriter scoped_clipboard_writer(
-        ui::Clipboard::GetForCurrentThread(), clipboard_type);
+    ui::ScopedClipboardWriter scoped_clipboard_writer(clipboard_type);
     scoped_clipboard_writer.WriteText(selected_text);
   }
 }